diff --git a/hypothesis-python/RELEASE.rst b/hypothesis-python/RELEASE.rst new file mode 100644 index 0000000000..aab3eb2b2a --- /dev/null +++ b/hypothesis-python/RELEASE.rst @@ -0,0 +1,3 @@ +RELEASE_TYPE: patch + +This is a formatting-only patch, enabled by a new version of :pypi:`isort`. diff --git a/hypothesis-python/src/hypothesis/__init__.py b/hypothesis-python/src/hypothesis/__init__.py index 6d172ba706..c3beab0080 100644 --- a/hypothesis-python/src/hypothesis/__init__.py +++ b/hypothesis-python/src/hypothesis/__init__.py @@ -22,14 +22,14 @@ failing examples it finds. """ +from __future__ import absolute_import, division, print_function -from hypothesis._settings import settings, Verbosity, Phase, HealthCheck, unlimited -from hypothesis.version import __version_info__, __version__ -from hypothesis.control import assume, note, reject, event -from hypothesis.core import given, find, example, seed, reproduce_failure, PrintSettings +from hypothesis._settings import HealthCheck, Phase, Verbosity, settings, unlimited +from hypothesis.control import assume, event, note, reject +from hypothesis.core import PrintSettings, example, find, given, reproduce_failure, seed from hypothesis.internal.entropy import register_random from hypothesis.utils.conventions import infer - +from hypothesis.version import __version__, __version_info__ __all__ = [ "settings", diff --git a/hypothesis-python/src/hypothesis/extra/__init__.py b/hypothesis-python/src/hypothesis/extra/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/src/hypothesis/extra/__init__.py +++ b/hypothesis-python/src/hypothesis/extra/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/src/hypothesis/extra/django/__init__.py b/hypothesis-python/src/hypothesis/extra/django/__init__.py index 203b881a9f..2c5b922c80 100644 --- a/hypothesis-python/src/hypothesis/extra/django/__init__.py +++ b/hypothesis-python/src/hypothesis/extra/django/__init__.py @@ -15,12 +15,14 @@ # # END HEADER +from __future__ import absolute_import, division, print_function + from hypothesis.extra.django._fields import from_field, register_field_strategy from hypothesis.extra.django._impl import ( TestCase, TransactionTestCase, - from_model, from_form, + from_model, ) __all__ = [ diff --git a/hypothesis-python/src/hypothesis/extra/pandas/__init__.py b/hypothesis-python/src/hypothesis/extra/pandas/__init__.py index c8d4166b7f..7224c5bf86 100644 --- a/hypothesis-python/src/hypothesis/extra/pandas/__init__.py +++ b/hypothesis-python/src/hypothesis/extra/pandas/__init__.py @@ -15,15 +15,15 @@ # # END HEADER -from __future__ import division, print_function, absolute_import +from __future__ import absolute_import, division, print_function from hypothesis.extra.pandas.impl import ( - series, - data_frames, column, columns, + data_frames, indexes, range_indexes, + series, ) __all__ = ["indexes", "range_indexes", "series", "column", "columns", "data_frames"] diff --git a/hypothesis-python/src/hypothesis/internal/__init__.py b/hypothesis-python/src/hypothesis/internal/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/src/hypothesis/internal/__init__.py +++ b/hypothesis-python/src/hypothesis/internal/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/src/hypothesis/internal/conjecture/__init__.py b/hypothesis-python/src/hypothesis/internal/conjecture/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/src/hypothesis/internal/conjecture/__init__.py +++ b/hypothesis-python/src/hypothesis/internal/conjecture/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/src/hypothesis/internal/conjecture/shrinking/__init__.py b/hypothesis-python/src/hypothesis/internal/conjecture/shrinking/__init__.py index 073d50488c..5f987c4eff 100644 --- a/hypothesis-python/src/hypothesis/internal/conjecture/shrinking/__init__.py +++ b/hypothesis-python/src/hypothesis/internal/conjecture/shrinking/__init__.py @@ -15,10 +15,11 @@ # # END HEADER +from __future__ import absolute_import, division, print_function + +from hypothesis.internal.conjecture.shrinking.floats import Float from hypothesis.internal.conjecture.shrinking.integer import Integer from hypothesis.internal.conjecture.shrinking.lexical import Lexical from hypothesis.internal.conjecture.shrinking.ordering import Ordering -from hypothesis.internal.conjecture.shrinking.floats import Float - __all__ = ["Lexical", "Integer", "Ordering", "Float"] diff --git a/hypothesis-python/src/hypothesis/searchstrategy/__init__.py b/hypothesis-python/src/hypothesis/searchstrategy/__init__.py index 314745d2d9..c0484b1fa0 100644 --- a/hypothesis-python/src/hypothesis/searchstrategy/__init__.py +++ b/hypothesis-python/src/hypothesis/searchstrategy/__init__.py @@ -18,6 +18,7 @@ """Package defining SearchStrategy, which is the core type that Hypothesis uses to explore data.""" +from __future__ import absolute_import, division, print_function from .strategies import SearchStrategy, check_strategy diff --git a/hypothesis-python/src/hypothesis/utils/__init__.py b/hypothesis-python/src/hypothesis/utils/__init__.py index 7921b05ff8..396c612d80 100644 --- a/hypothesis-python/src/hypothesis/utils/__init__.py +++ b/hypothesis-python/src/hypothesis/utils/__init__.py @@ -17,3 +17,5 @@ """hypothesis.utils is a package for things that you can consider part of the semi-public Hypothesis API but aren't really the core point.""" + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/src/hypothesis/vendor/__init__.py b/hypothesis-python/src/hypothesis/vendor/__init__.py index 4f2aa491c1..3d4cb72643 100644 --- a/hypothesis-python/src/hypothesis/vendor/__init__.py +++ b/hypothesis-python/src/hypothesis/vendor/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/__init__.py b/hypothesis-python/tests/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/__init__.py +++ b/hypothesis-python/tests/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/common/__init__.py b/hypothesis-python/tests/common/__init__.py index 77a9d1b777..dee74053c5 100644 --- a/hypothesis-python/tests/common/__init__.py +++ b/hypothesis-python/tests/common/__init__.py @@ -15,38 +15,40 @@ # # END HEADER +from __future__ import absolute_import, division, print_function + import sys from collections import namedtuple -try: - import pytest -except ImportError: - pytest = None - -from tests.common.debug import TIME_INCREMENT from hypothesis.strategies import ( - integers, - floats, - just, - one_of, - sampled_from, - lists, + binary, booleans, - dictionaries, - tuples, - frozensets, + builds, complex_numbers, - sets, - text, - binary, decimals, + dictionaries, + fixed_dictionaries, + floats, fractions, + frozensets, + integers, + just, + lists, none, + one_of, randoms, - builds, - fixed_dictionaries, recursive, + sampled_from, + sets, + text, + tuples, ) +from tests.common.debug import TIME_INCREMENT + +try: + import pytest +except ImportError: + pytest = None __all__ = ["standard_types", "OrderedPair", "TIME_INCREMENT"] diff --git a/hypothesis-python/tests/cover/__init__.py b/hypothesis-python/tests/cover/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/cover/__init__.py +++ b/hypothesis-python/tests/cover/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/cover/test_simple_characters.py b/hypothesis-python/tests/cover/test_simple_characters.py index be3cccb04b..360cc67ddc 100644 --- a/hypothesis-python/tests/cover/test_simple_characters.py +++ b/hypothesis-python/tests/cover/test_simple_characters.py @@ -130,6 +130,7 @@ def test_whitelisted_characters_override(): assert_no_examples(st, lambda c: c not in good_characters + "0123456789") +@pytest.mark.skip # temporary skip due to 560 second (!) perf regression; see #1864 def test_blacklisted_characters(): bad_chars = u"te02ั‚ะตัั‚49st" st = characters( diff --git a/hypothesis-python/tests/datetime/__init__.py b/hypothesis-python/tests/datetime/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/datetime/__init__.py +++ b/hypothesis-python/tests/datetime/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/django/__init__.py b/hypothesis-python/tests/django/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/django/__init__.py +++ b/hypothesis-python/tests/django/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/django/toys/__init__.py b/hypothesis-python/tests/django/toys/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/django/toys/__init__.py +++ b/hypothesis-python/tests/django/toys/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/django/toystore/__init__.py b/hypothesis-python/tests/django/toystore/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/django/toystore/__init__.py +++ b/hypothesis-python/tests/django/toystore/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/dpcontracts/__init__.py b/hypothesis-python/tests/dpcontracts/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/dpcontracts/__init__.py +++ b/hypothesis-python/tests/dpcontracts/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/lark/__init__.py b/hypothesis-python/tests/lark/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/lark/__init__.py +++ b/hypothesis-python/tests/lark/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/nocover/__init__.py b/hypothesis-python/tests/nocover/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/nocover/__init__.py +++ b/hypothesis-python/tests/nocover/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/numpy/__init__.py b/hypothesis-python/tests/numpy/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/numpy/__init__.py +++ b/hypothesis-python/tests/numpy/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/pandas/__init__.py b/hypothesis-python/tests/pandas/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/pandas/__init__.py +++ b/hypothesis-python/tests/pandas/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/py2/__init__.py b/hypothesis-python/tests/py2/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/py2/__init__.py +++ b/hypothesis-python/tests/py2/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/py3/__init__.py b/hypothesis-python/tests/py3/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/py3/__init__.py +++ b/hypothesis-python/tests/py3/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/hypothesis-python/tests/quality/__init__.py b/hypothesis-python/tests/quality/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/hypothesis-python/tests/quality/__init__.py +++ b/hypothesis-python/tests/quality/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function diff --git a/requirements/coverage.txt b/requirements/coverage.txt index cf999bc000..e3a024d920 100644 --- a/requirements/coverage.txt +++ b/requirements/coverage.txt @@ -4,8 +4,8 @@ # # pip-compile requirements/coverage.in --output-file requirements/coverage.txt # -coverage==4.5.2 -lark-parser==0.6.6 +coverage==4.5.3 +lark-parser==0.6.7 numpy==1.16.2 pandas==0.24.1 python-dateutil==2.8.0 # via pandas diff --git a/requirements/tools.txt b/requirements/tools.txt index a5a8313870..0f277b0c01 100644 --- a/requirements/tools.txt +++ b/requirements/tools.txt @@ -13,10 +13,10 @@ backcall==0.1.0 # via ipython bandit==1.5.1 black==18.9b0 bleach==3.1.0 # via readme-renderer -certifi==2018.11.29 # via requests +certifi==2019.3.9 # via requests chardet==3.0.4 # via requests click==7.0 # via black, pip-tools, pyupio, safety -coverage==4.5.2 +coverage==4.5.3 decorator==4.3.2 # via ipython, traitlets deprecated==1.2.5 # via pygithub django==2.1.7 @@ -35,10 +35,10 @@ idna==2.8 # via requests imagesize==1.1.0 # via sphinx ipython-genutils==0.2.0 # via traitlets ipython==7.3.0 -isort==4.3.10 +isort==4.3.15 jedi==0.13.3 # via ipython jinja2==2.10 # via pyupio, sphinx -lark-parser==0.6.6 +lark-parser==0.6.7 markupsafe==1.1.1 # via jinja2 mccabe==0.6.1 # via flake8 mock==2.0.0 @@ -79,7 +79,7 @@ six==1.12.0 # via bandit, bleach, dparse, mock, more-itertools, pa smmap2==2.0.5 # via gitdb2 snowballstemmer==1.2.1 # via pydocstyle, sphinx sphinx-rtd-theme==0.4.3 -sphinx==1.8.4 +sphinx==1.8.5 sphinxcontrib-websupport==1.1.0 # via sphinx stevedore==1.30.1 # via bandit toml==0.10.0 diff --git a/tooling/src/hypothesistooling/__init__.py b/tooling/src/hypothesistooling/__init__.py index 6e099a8c62..ef6b34f638 100644 --- a/tooling/src/hypothesistooling/__init__.py +++ b/tooling/src/hypothesistooling/__init__.py @@ -15,7 +15,7 @@ # # END HEADER -from __future__ import division, print_function, absolute_import +from __future__ import absolute_import, division, print_function import os import shlex diff --git a/tooling/src/hypothesistooling/projects/__init__.py b/tooling/src/hypothesistooling/projects/__init__.py index 1f13f05803..7e057b6b94 100644 --- a/tooling/src/hypothesistooling/projects/__init__.py +++ b/tooling/src/hypothesistooling/projects/__init__.py @@ -14,3 +14,5 @@ # obtain one at https://mozilla.org/MPL/2.0/. # # END HEADER + +from __future__ import absolute_import, division, print_function