[Python-modules-commits] [python-hypothesis] 04/10: merge patched into master

Tristan Seligmann mithrandi at moszumanska.debian.org
Wed Dec 20 07:10:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-hypothesis.

commit 202beee85e680755b9f43f7c21df67c77c9b00f2
Merge: 6c77c59 e039897
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Tue Dec 19 23:01:56 2017 +0200

    merge patched into master

 .coveragerc                                        |    1 +
 .gitignore                                         |    1 +
 .pyup.yml                                          |   11 +-
 .travis.yml                                        |   14 +-
 CONTRIBUTING.rst                                   |   78 +-
 Makefile                                           |  107 +-
 appveyor.yml                                       |   12 -
 ...ys => arrays10-valid=always-interesting=always} |   16 +-
 ...arrays10-valid=always-interesting=array_average |   29 +
 .../arrays10-valid=always-interesting=lower_bound  |   29 +
 .../arrays10-valid=always-interesting=never        |   29 +
 ...ays10-valid=always-interesting=size_lower_bound |   29 +
 .../arrays10-valid=always-interesting=usually      |   29 +
 ...rrays10-valid=usually-interesting=array_average |   29 +
 ...ys10-valid=usually-interesting=size_lower_bound |   29 +
 ...s => arraysvar-valid=always-interesting=always} |   16 +-
 ...rraysvar-valid=always-interesting=array_average |   29 +
 .../arraysvar-valid=always-interesting=lower_bound |   29 +
 .../arraysvar-valid=always-interesting=never       |   29 +
 ...ysvar-valid=always-interesting=size_lower_bound |   29 +
 .../arraysvar-valid=always-interesting=usually     |   29 +
 ...raysvar-valid=usually-interesting=array_average |   29 +
 ...svar-valid=usually-interesting=size_lower_bound |   29 +
 .../intlists-valid=always-interesting=always       |   14 +-
 ...ntlists-valid=always-interesting=has_duplicates |   14 +-
 .../intlists-valid=always-interesting=lower_bound  |   14 +-
 .../intlists-valid=always-interesting=minsum       |   14 +-
 .../intlists-valid=always-interesting=never        |   14 +-
 .../intlists-valid=always-interesting=nontrivial   |   29 -
 ...lists-valid=always-interesting=size_lower_bound |   29 +
 .../intlists-valid=always-interesting=usually      |   14 +-
 ...ntlists-valid=has_duplicates-interesting=minsum |   14 +-
 .../intlists-valid=usually-interesting=nontrivial  |   29 -
 ...ists-valid=usually-interesting=size_lower_bound |   29 +
 .../ints-valid=always-interesting=always           |   14 +-
 .../ints-valid=always-interesting=lower_bound      |   14 +-
 benchmark-data/ints-valid=always-interesting=never |   14 +-
 .../ints-valid=always-interesting=nontrivial       |   29 -
 .../ints-valid=always-interesting=size_lower_bound |   29 +
 .../ints-valid=always-interesting=usually          |   12 +-
 .../ints-valid=usually-interesting=nontrivial      |   29 -
 ...ints-valid=usually-interesting=size_lower_bound |   29 +
 .../sizedintlists-valid=always-interesting=always  |   14 +-
 ...edintlists-valid=always-interesting=lower_bound |   14 +-
 .../sizedintlists-valid=always-interesting=never   |   14 +-
 ...zedintlists-valid=always-interesting=nontrivial |   29 -
 ...lists-valid=always-interesting=size_lower_bound |   29 +
 .../sizedintlists-valid=always-interesting=usually |   14 +-
 ...edintlists-valid=usually-interesting=nontrivial |   29 -
 ...ists-valid=usually-interesting=size_lower_bound |   29 +
 ...always => text-valid=always-interesting=always} |   16 +-
 .../text-valid=always-interesting=lower_bound      |   29 +
 benchmark-data/text-valid=always-interesting=never |   29 +
 .../text-valid=always-interesting=size_lower_bound |   29 +
 .../text-valid=always-interesting=usually          |   29 +
 ...text-valid=usually-interesting=size_lower_bound |   29 +
 ...lways => text5-valid=always-interesting=always} |   16 +-
 .../text5-valid=always-interesting=lower_bound     |   29 +
 .../text5-valid=always-interesting=never           |   29 +
 ...text5-valid=always-interesting=size_lower_bound |   29 +
 .../text5-valid=always-interesting=usually         |   29 +
 ...ext5-valid=usually-interesting=size_lower_bound |   29 +
 circle.yml                                         |    2 +-
 debian/.git-dpm                                    |    6 +-
 debian/patches/0001-Delay-__version__-import.patch |   16 +-
 docs/changes.rst                                   | 1104 ++++++++++++++-
 docs/conf.py                                       |   42 +-
 docs/data.rst                                      |  298 ++--
 docs/details.rst                                   |  205 +--
 docs/development.rst                               |    8 +-
 docs/django.rst                                    |    7 +-
 docs/endorsements.rst                              |   30 +
 docs/examples.rst                                  |    2 +-
 docs/extras.rst                                    |   66 +-
 docs/healthchecks.rst                              |    9 +-
 docs/index.rst                                     |    1 +
 docs/numpy.rst                                     |   43 +-
 docs/packaging.rst                                 |   36 +-
 docs/quickstart.rst                                |    5 +-
 docs/reproducing.rst                               |  120 ++
 docs/settings.rst                                  |  158 ++-
 docs/strategies.rst                                |    8 +-
 docs/usage.rst                                     |    6 +-
 guides/api-style.rst                               |  125 ++
 guides/documentation.rst                           |   22 +-
 guides/review.rst                                  |   10 +-
 requirements/benchmark.in                          |    1 +
 requirements/benchmark.txt                         |    7 +-
 requirements/coverage.in                           |    4 +
 requirements/coverage.txt                          |   12 +
 requirements/test.in                               |    2 +
 requirements/test.txt                              |   14 +-
 requirements/tools.in                              |    3 +
 requirements/tools.txt                             |   58 +-
 requirements/typing.in                             |    1 +
 requirements/typing.txt                            |    7 +
 scripts/basic-test.sh                              |   16 +-
 scripts/benchmarks.py                              |   43 +-
 scripts/build-documentation.sh                     |   21 +
 scripts/check-changelog.py                         |  101 --
 .../{check-untagged.py => check-release-file.py}   |   13 +-
 scripts/deploy.py                                  |   80 +-
 scripts/fix_doctests.py                            |  126 ++
 scripts/hypothesistooling.py                       |  225 ++-
 scripts/install.sh                                 |   13 +-
 scripts/run-circle.sh                              |   14 -
 scripts/{check-untagged.py => run_circle.py}       |   28 +-
 .../run_travis_make_task.py                        |   22 +-
 scripts/unicodechecker.py                          |    6 +-
 ...ck-untagged.py => update-changelog-for-docs.py} |   20 +-
 scripts/validate_branch_check.py                   |   64 +
 tests/django/manage.py => scripts/validate_pyup.py |   22 +-
 secrets.tar.enc                                    |  Bin 10256 -> 10256 bytes
 setup.cfg                                          |    0
 setup.py                                           |    7 +-
 src/hypothesis/__init__.py                         |   11 +-
 src/hypothesis/_settings.py                        |  244 +++-
 src/hypothesis/control.py                          |    4 +-
 src/hypothesis/core.py                             |  963 +++++++++----
 src/hypothesis/database.py                         |   52 +-
 src/hypothesis/errors.py                           |   51 +-
 src/hypothesis/extra/django/models.py              |  178 +--
 src/hypothesis/extra/fakefactory.py                |    6 +
 src/hypothesis/extra/numpy.py                      |  275 +++-
 .../conventions.py => extra/pandas/__init__.py}    |   18 +-
 src/hypothesis/extra/pandas/impl.py                |  645 +++++++++
 src/hypothesis/extra/pytestplugin.py               |   18 +
 src/hypothesis/internal/cache.py                   |  228 +++
 src/hypothesis/internal/charmap.py                 |  226 ++-
 src/hypothesis/internal/compat.py                  |  112 +-
 src/hypothesis/internal/conjecture/data.py         |  176 ++-
 src/hypothesis/internal/conjecture/engine.py       | 1491 ++++++++++++++------
 src/hypothesis/internal/conjecture/floats.py       |  246 ++++
 src/hypothesis/internal/conjecture/minimizer.py    |  222 +--
 src/hypothesis/internal/conjecture/utils.py        |  126 +-
 src/hypothesis/internal/coverage.py                |  125 ++
 src/hypothesis/internal/escalation.py              |   63 +-
 src/hypothesis/internal/healthcheck.py             |   38 +
 .../internal/{deferredformat.py => lazyformat.py}  |    4 +-
 src/hypothesis/internal/reflection.py              |   75 +-
 src/hypothesis/internal/renaming.py                |   66 +
 src/hypothesis/internal/validation.py              |  147 ++
 src/hypothesis/provisional.py                      |   84 ++
 src/hypothesis/searchstrategy/collections.py       |  130 +-
 src/hypothesis/searchstrategy/datetime.py          |   48 +-
 src/hypothesis/searchstrategy/deferred.py          |  126 +-
 src/hypothesis/searchstrategy/flatmapped.py        |    5 +-
 .../searchstrategy/{deferred.py => lazy.py}        |  103 +-
 src/hypothesis/searchstrategy/misc.py              |   25 +-
 src/hypothesis/searchstrategy/numbers.py           |   25 +-
 src/hypothesis/searchstrategy/recursive.py         |   10 +-
 src/hypothesis/searchstrategy/regex.py             |  499 +++++++
 src/hypothesis/searchstrategy/reprwrapper.py       |   44 -
 src/hypothesis/searchstrategy/shared.py            |    4 +-
 src/hypothesis/searchstrategy/strategies.py        |  370 ++++-
 src/hypothesis/searchstrategy/streams.py           |    2 +
 src/hypothesis/searchstrategy/strings.py           |   30 +-
 src/hypothesis/searchstrategy/types.py             |  243 ++++
 src/hypothesis/searchstrategy/wrappers.py          |   51 -
 src/hypothesis/stateful.py                         |   31 +-
 src/hypothesis/statistics.py                       |   12 +
 src/hypothesis/strategies.py                       | 1079 +++++++++-----
 src/hypothesis/strategytests.py                    |  129 --
 src/hypothesis/tools/mergedbs.py                   |  136 --
 src/hypothesis/utils/conventions.py                |    1 +
 src/hypothesis/version.py                          |    2 +-
 tests/common/__init__.py                           |   84 +-
 .../{cover/test_choices.py => common/arguments.py} |   43 +-
 tests/common/debug.py                              |   85 +-
 tests/common/setup.py                              |   38 +-
 tests/common/strategies.py                         |   60 +
 tests/common/utils.py                              |   47 +-
 tests/conftest.py                                  |   27 +-
 tests/cover/test_arbitrary_data.py                 |    4 +-
 tests/cover/test_argument_validation.py            |   56 +
 tests/cover/test_bad_repr.py                       |   21 +-
 tests/cover/test_cache_implementation.py           |  195 +++
 tests/cover/{test_example.py => test_cacheable.py} |   37 +-
 tests/cover/test_charmap.py                        |   44 +-
 tests/cover/test_choices.py                        |   19 +-
 tests/cover/test_classmap.py                       |   91 --
 tests/cover/test_composite.py                      |   18 +-
 tests/cover/test_conjecture_engine.py              |  592 +++++---
 tests/cover/test_conjecture_float_encoding.py      |  227 +++
 tests/cover/test_conjecture_minimizer.py           |    6 +
 tests/cover/test_conjecture_test_data.py           |    5 +
 tests/cover/test_conjecture_utils.py               |   15 +-
 tests/cover/test_core.py                           |    9 +-
 tests/cover/test_custom_reprs.py                   |    4 +-
 tests/cover/test_database_backend.py               |   30 +-
 ...st_map.py => test_database_seed_deprecation.py} |   24 +-
 tests/cover/test_database_usage.py                 |  123 +-
 tests/cover/test_datetimes.py                      |   52 +-
 tests/cover/test_deadline.py                       |  158 +++
 tests/cover/test_deferred_strategies.py            |  202 +++
 tests/cover/test_direct_strategies.py              |   58 +-
 tests/cover/test_escalation.py                     |   68 +
 tests/cover/test_example.py                        |   46 +-
 tests/cover/test_find.py                           |    2 +
 tests/cover/test_flatmap.py                        |   12 +-
 tests/cover/test_float_nastiness.py                |   12 +-
 tests/cover/test_given_error_conditions.py         |   46 +-
 tests/cover/test_health_checks.py                  |  131 +-
 tests/cover/test_integer_ranges.py                 |    6 +-
 tests/cover/test_interleaving.py                   |   30 +-
 tests/cover/test_intervalset.py                    |   32 +-
 tests/cover/test_lambda_formatting.py              |   63 +
 tests/cover/test_map.py                            |    7 +-
 .../{test_randomization.py => test_nesting.py}     |   26 +-
 tests/cover/test_nothing.py                        |   23 +-
 tests/cover/test_numerics.py                       |   62 +-
 .../version.py => tests/cover/test_one_of.py       |   10 +-
 tests/cover/test_phases.py                         |   40 +
 tests/cover/test_provisional_strategies.py         |   51 +
 tests/cover/test_randomization.py                  |    2 +-
 tests/cover/test_reflection.py                     |   63 +-
 tests/cover/test_regex.py                          |  386 +++++
 tests/cover/test_regressions.py                    |   80 ++
 .../classmap.py => tests/cover/test_renaming.py    |   33 +-
 tests/cover/test_reproduce_failure.py              |  203 +++
 tests/cover/test_reusable_values.py                |   94 ++
 tests/cover/test_sampled_from.py                   |   22 +-
 tests/cover/test_searchstrategy.py                 |    5 +-
 tests/cover/test_seed_printing.py                  |  123 ++
 tests/cover/test_sets.py                           |    2 +-
 tests/cover/test_settings.py                       |   49 +-
 tests/cover/test_setup_teardown.py                 |   14 +-
 tests/cover/test_shrinking_limits.py               |    3 +
 tests/cover/test_simple_characters.py              |   54 +-
 tests/cover/test_simple_collections.py             |   19 +-
 tests/cover/test_simple_numbers.py                 |   22 +-
 tests/cover/test_skipping.py                       |   49 +
 tests/cover/test_slippage.py                       |  218 +++
 tests/cover/test_stateful.py                       |   22 +-
 tests/cover/test_statistical_events.py             |   64 +-
 tests/cover/test_strategytests.py                  |   28 -
 tests/cover/test_streams.py                        |   19 +-
 tests/cover/test_target_selector.py                |  124 ++
 tests/cover/test_testdecorators.py                 |   71 +-
 tests/cover/test_timeout.py                        |  105 ++
 tests/cover/test_type_lookup.py                    |  150 ++
 tests/cover/test_uuids.py                          |   14 +-
 tests/cover/test_validation.py                     |    4 +-
 tests/datetime/test_dates.py                       |    4 +-
 tests/datetime/test_datetime.py                    |   32 +-
 tests/datetime/test_times.py                       |   27 +-
 tests/datetime/test_timezones.py                   |   23 +-
 tests/django/manage.py                             |    9 +
 tests/django/toys/urls.py                          |    4 +-
 tests/django/toystore/models.py                    |   28 +-
 tests/django/toystore/test_basic_configuration.py  |    3 +-
 tests/django/toystore/test_given_models.py         |   32 +-
 tests/fakefactory/test_fake_factory.py             |   56 +-
 tests/nocover/test_boundary_exploration.py         |   50 +
 .../test_characters.py}                            |   33 +-
 tests/nocover/test_choices.py                      |   10 +-
 tests/nocover/test_collective_minimization.py      |    3 +-
 tests/nocover/test_compat.py                       |   36 +-
 tests/nocover/test_conjecture_engine.py            |  120 ++
 tests/nocover/test_coverage.py                     |  120 ++
 .../{cover => nocover}/test_database_agreement.py  |   15 +-
 tests/nocover/test_deferred_strategies.py          |   71 +
 tests/nocover/test_descriptortests.py              |  206 ---
 tests/nocover/test_float_shrinking.py              |   64 +
 tests/nocover/test_floating.py                     |   32 +-
 tests/nocover/test_git_merge.py                    |  140 --
 .../nocover/test_large_examples.py                 |    8 +-
 tests/nocover/test_recursive.py                    |   18 +-
 tests/nocover/test_regex.py                        |   86 ++
 tests/nocover/test_strategy_state.py               |   32 +-
 tests/nocover/test_streams.py                      |   15 +-
 tests/nocover/test_target_selector.py              |   77 +
 tests/numpy/test_argument_validation.py            |   60 +
 tests/numpy/test_fill_values.py                    |   61 +
 tests/numpy/test_gen_data.py                       |  212 ++-
 .../test_dates.py => numpy/test_sampled_from.py}   |   46 +-
 {src/hypothesis/tools => tests/pandas}/__init__.py |    0
 tests/pandas/helpers.py                            |   46 +
 tests/pandas/test_argument_validation.py           |   71 +
 tests/pandas/test_data_frame.py                    |  242 ++++
 tests/pandas/test_indexes.py                       |  112 ++
 tests/pandas/test_series.py                        |   70 +
 tests/py3/test_lookup.py                           |  367 +++++
 tests/pytest/test_fixtures.py                      |   35 +
 .../manage.py => pytest/test_pytest_detection.py}  |   26 +-
 tests/pytest/test_seeding.py                       |  124 ++
 .../pytest/{test_fixtures.py => test_skipping.py}  |   45 +-
 tests/pytest/test_statistics.py                    |   15 +-
 tests/quality/test_discovery_ability.py            |    6 +-
 tests/quality/test_shrink_quality.py               |   20 +-
 tox.ini                                            |   97 +-
 291 files changed, 17102 insertions(+), 4788 deletions(-)

diff --cc debian/.git-dpm
index fc7bf2a,0000000..2ad6989
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- ab18fca80e13e14bb6b40c4878a828605c517726
- ab18fca80e13e14bb6b40c4878a828605c517726
- 766cc744a17729331948321ed5e4bf235839a771
++e03989772bed13547b4f13e3b77db8b9594d1b6e
++e03989772bed13547b4f13e3b77db8b9594d1b6e
++ac77b37f828c9c25f214db67a45bda7fdc9f865f
 +ac77b37f828c9c25f214db67a45bda7fdc9f865f
 +python-hypothesis_3.44.1.orig.tar.gz
 +83fec72102163608d41e6bbe2d155f2ac564b018
 +488917
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Delay-__version__-import.patch
index ad26bb9,0000000..77dbe1e
mode 100644,000000..100644
--- a/debian/patches/0001-Delay-__version__-import.patch
+++ b/debian/patches/0001-Delay-__version__-import.patch
@@@ -1,30 -1,0 +1,28 @@@
- From ab18fca80e13e14bb6b40c4878a828605c517726 Mon Sep 17 00:00:00 2001
++From e03989772bed13547b4f13e3b77db8b9594d1b6e Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at debian.org>
 +Date: Fri, 7 Jul 2017 14:43:57 +0200
 +Subject: Delay __version__ import.
 +
 +---
-  docs/conf.py | 4 ++--
-  1 file changed, 2 insertions(+), 2 deletions(-)
++ docs/conf.py | 4 ++++
++ 1 file changed, 4 insertions(+)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index ee65926..4a84cba 100644
++index 20ad9cd..5b321ae 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
- @@ -24,14 +24,14 @@ import os
++@@ -23,10 +23,14 @@ import os
 + import sys
 + import datetime
 + 
- -from hypothesis import __version__
- -
-  on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
-  
+++on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+++
 + sys.path.append(
 +     os.path.join(os.path.dirname(__file__), '..', 'src')
 + )
 + 
 ++from hypothesis import __version__
 ++
 + 
 + autodoc_member_order = 'bysource'
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-hypothesis.git



More information about the Python-modules-commits mailing list