From e21a5c19e4d002b53426a26f432e502cf300ca87 Mon Sep 17 00:00:00 2001 From: pilkibun Date: Thu, 11 Jul 2019 03:44:44 -0500 Subject: [PATCH 1/4] CLN: remove deprecated hypothesis timeout --- pandas/conftest.py | 1 - requirements-dev.txt | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pandas/conftest.py b/pandas/conftest.py index ef2758d263e1a..2cf7bf6a6df41 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -25,7 +25,6 @@ # if it really is slow add `@settings(deadline=...)` with a working value, # or `deadline=None` to entirely disable timeouts for that test. deadline=500, - timeout=hypothesis.unlimited, suppress_health_check=(hypothesis.HealthCheck.too_slow,), ) hypothesis.settings.load_profile("ci") diff --git a/requirements-dev.txt b/requirements-dev.txt index e49ad10bfc99d..7dd228b305ce0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -19,7 +19,7 @@ nbsphinx pandoc boto3 botocore>=1.11 -hypothesis>=3.82 +hypothesis>=4.0 moto pytest>=4.0.2 pytest-cov From bbd20f8fff06cf94e1ad4cc917a19870c2666db7 Mon Sep 17 00:00:00 2001 From: pilkibun Date: Thu, 11 Jul 2019 13:59:26 -0500 Subject: [PATCH 2/4] whatsnew --- doc/source/whatsnew/v0.25.0.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index 042c97a0c98b1..db7a6c9d8864e 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -746,7 +746,7 @@ Increased minimum versions for dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Due to dropping support for Python 2.7, a number of optional dependencies have updated minimum versions (:issue:`25725`, :issue:`24942`, :issue:`25752`). -Independently, some minimum supported versions of dependencies were updated (:issue:`23519`, :issue:`25554`). +Independently, some minimum supported versions of dependencies were updated (:issue:`23519`, :issue:`25554`, :issue:`27336`). If installed, we now require: +-----------------+-----------------+----------+ @@ -764,6 +764,8 @@ If installed, we now require: +-----------------+-----------------+----------+ | pytest (dev) | 4.0.2 | | +-----------------+-----------------+----------+ +| hypothesis | 4.0.0 | | ++-----------------+-----------------+----------+ For `optional libraries `_ the general recommendation is to use the latest version. The following table lists the lowest version per library that is currently being tested throughout the development of pandas. From 7ceef1387c46d0828c8787dac5f5c62e221b417f Mon Sep 17 00:00:00 2001 From: pilkibun Date: Thu, 11 Jul 2019 13:59:31 -0500 Subject: [PATCH 3/4] update ci/deps --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-37-numpydev.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- ci/deps/azure-windows-36.yaml | 2 +- ci/deps/azure-windows-37.yaml | 2 +- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-locale.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 97c45b2be27d7..9f9072a4c470e 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -19,7 +19,7 @@ dependencies: - xlwt=1.2.0 # universal - cython=0.28.2 - - hypothesis>=3.58.0 + - hypothesis>=4.0 - pytest-xdist - pytest-mock - pytest-azurepipelines diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 8f8273f57c3fe..80d52867ae512 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -24,7 +24,7 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - hypothesis>=3.58.0 + - hypothesis>=4.0 - pip - pip: - html5lib==1.0b2 diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index 2bf2bd74795d2..ea8080dbaed92 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -33,4 +33,4 @@ dependencies: - moto - pip - pip: - - hypothesis>=3.58.0 + - hypothesis>=4.0 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 05adbf0c924dc..7ab860baec9b8 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -32,4 +32,4 @@ dependencies: - pytest-azurepipelines - pip - pip: - - hypothesis>=3.58.0 + - hypothesis>=4.0 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index c56dc819a90b1..81cbacec81885 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -9,7 +9,7 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock - - hypothesis>=3.58.0 + - hypothesis>=4.0 - pip - pip: - "git+git://github.com/dateutil/dateutil.git" diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 0b96dd9762ef5..34fd5de7e6ce9 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -28,5 +28,5 @@ dependencies: - pytest==4.5.0 - pytest-xdist - pytest-mock - - hypothesis>=3.58.0 + - hypothesis>=4.0 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index b0f3f5389ac85..e88c54082b9e6 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -27,4 +27,4 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - hypothesis>=3.58.0 + - hypothesis>=4.0 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 08208d1e2d59a..982d698423e85 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -30,5 +30,5 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - hypothesis>=3.58.0 + - hypothesis>=4.0 - pyreadstat diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 6f85c32b9a915..6cde26a26a7e2 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -43,7 +43,7 @@ dependencies: - pytest-xdist - pytest-cov - pytest-mock - - hypothesis>=3.58.0 + - hypothesis>=4.0 - pip - pip: - brotlipy diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index 0d9a760914dab..abbf722b8b84f 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -39,4 +39,4 @@ dependencies: - pytest-mock - pip - pip: - - hypothesis>=3.58.0 + - hypothesis>=4.0 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index 538a82f66e4c8..c14618e48af6d 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -29,4 +29,4 @@ dependencies: - pytest-xdist - pytest-mock - moto - - hypothesis>=3.58.0 + - hypothesis>=4.0 diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index c9a8c274fb144..18ce23b90942d 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -16,7 +16,7 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock - - hypothesis>=3.58.0 + - hypothesis>=4.0 - s3fs - pip - pyreadstat From c22fce627b70277c3321b88951ec71ff47414bb0 Mon Sep 17 00:00:00 2001 From: pilkibun Date: Thu, 11 Jul 2019 15:14:23 -0500 Subject: [PATCH 4/4] revert --- ci/deps/azure-35-compat.yaml | 2 +- ci/deps/azure-36-locale.yaml | 2 +- ci/deps/azure-36-locale_slow.yaml | 2 +- ci/deps/azure-37-locale.yaml | 2 +- ci/deps/azure-37-numpydev.yaml | 2 +- ci/deps/azure-macos-35.yaml | 2 +- ci/deps/azure-windows-36.yaml | 2 +- ci/deps/azure-windows-37.yaml | 2 +- ci/deps/travis-36-cov.yaml | 2 +- ci/deps/travis-36-locale.yaml | 2 +- ci/deps/travis-36-slow.yaml | 2 +- ci/deps/travis-37.yaml | 2 +- doc/source/whatsnew/v0.25.0.rst | 4 +--- requirements-dev.txt | 2 +- 14 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ci/deps/azure-35-compat.yaml b/ci/deps/azure-35-compat.yaml index 9f9072a4c470e..97c45b2be27d7 100644 --- a/ci/deps/azure-35-compat.yaml +++ b/ci/deps/azure-35-compat.yaml @@ -19,7 +19,7 @@ dependencies: - xlwt=1.2.0 # universal - cython=0.28.2 - - hypothesis>=4.0 + - hypothesis>=3.58.0 - pytest-xdist - pytest-mock - pytest-azurepipelines diff --git a/ci/deps/azure-36-locale.yaml b/ci/deps/azure-36-locale.yaml index 80d52867ae512..8f8273f57c3fe 100644 --- a/ci/deps/azure-36-locale.yaml +++ b/ci/deps/azure-36-locale.yaml @@ -24,7 +24,7 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - hypothesis>=4.0 + - hypothesis>=3.58.0 - pip - pip: - html5lib==1.0b2 diff --git a/ci/deps/azure-36-locale_slow.yaml b/ci/deps/azure-36-locale_slow.yaml index ea8080dbaed92..2bf2bd74795d2 100644 --- a/ci/deps/azure-36-locale_slow.yaml +++ b/ci/deps/azure-36-locale_slow.yaml @@ -33,4 +33,4 @@ dependencies: - moto - pip - pip: - - hypothesis>=4.0 + - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-locale.yaml b/ci/deps/azure-37-locale.yaml index 7ab860baec9b8..05adbf0c924dc 100644 --- a/ci/deps/azure-37-locale.yaml +++ b/ci/deps/azure-37-locale.yaml @@ -32,4 +32,4 @@ dependencies: - pytest-azurepipelines - pip - pip: - - hypothesis>=4.0 + - hypothesis>=3.58.0 diff --git a/ci/deps/azure-37-numpydev.yaml b/ci/deps/azure-37-numpydev.yaml index 81cbacec81885..c56dc819a90b1 100644 --- a/ci/deps/azure-37-numpydev.yaml +++ b/ci/deps/azure-37-numpydev.yaml @@ -9,7 +9,7 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock - - hypothesis>=4.0 + - hypothesis>=3.58.0 - pip - pip: - "git+git://github.com/dateutil/dateutil.git" diff --git a/ci/deps/azure-macos-35.yaml b/ci/deps/azure-macos-35.yaml index 34fd5de7e6ce9..0b96dd9762ef5 100644 --- a/ci/deps/azure-macos-35.yaml +++ b/ci/deps/azure-macos-35.yaml @@ -28,5 +28,5 @@ dependencies: - pytest==4.5.0 - pytest-xdist - pytest-mock - - hypothesis>=4.0 + - hypothesis>=3.58.0 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-36.yaml b/ci/deps/azure-windows-36.yaml index e88c54082b9e6..b0f3f5389ac85 100644 --- a/ci/deps/azure-windows-36.yaml +++ b/ci/deps/azure-windows-36.yaml @@ -27,4 +27,4 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - hypothesis>=4.0 + - hypothesis>=3.58.0 diff --git a/ci/deps/azure-windows-37.yaml b/ci/deps/azure-windows-37.yaml index 982d698423e85..08208d1e2d59a 100644 --- a/ci/deps/azure-windows-37.yaml +++ b/ci/deps/azure-windows-37.yaml @@ -30,5 +30,5 @@ dependencies: - pytest-xdist - pytest-mock - pytest-azurepipelines - - hypothesis>=4.0 + - hypothesis>=3.58.0 - pyreadstat diff --git a/ci/deps/travis-36-cov.yaml b/ci/deps/travis-36-cov.yaml index 6cde26a26a7e2..6f85c32b9a915 100644 --- a/ci/deps/travis-36-cov.yaml +++ b/ci/deps/travis-36-cov.yaml @@ -43,7 +43,7 @@ dependencies: - pytest-xdist - pytest-cov - pytest-mock - - hypothesis>=4.0 + - hypothesis>=3.58.0 - pip - pip: - brotlipy diff --git a/ci/deps/travis-36-locale.yaml b/ci/deps/travis-36-locale.yaml index abbf722b8b84f..0d9a760914dab 100644 --- a/ci/deps/travis-36-locale.yaml +++ b/ci/deps/travis-36-locale.yaml @@ -39,4 +39,4 @@ dependencies: - pytest-mock - pip - pip: - - hypothesis>=4.0 + - hypothesis>=3.58.0 diff --git a/ci/deps/travis-36-slow.yaml b/ci/deps/travis-36-slow.yaml index c14618e48af6d..538a82f66e4c8 100644 --- a/ci/deps/travis-36-slow.yaml +++ b/ci/deps/travis-36-slow.yaml @@ -29,4 +29,4 @@ dependencies: - pytest-xdist - pytest-mock - moto - - hypothesis>=4.0 + - hypothesis>=3.58.0 diff --git a/ci/deps/travis-37.yaml b/ci/deps/travis-37.yaml index 18ce23b90942d..c9a8c274fb144 100644 --- a/ci/deps/travis-37.yaml +++ b/ci/deps/travis-37.yaml @@ -16,7 +16,7 @@ dependencies: - pytest>=4.0.2 - pytest-xdist - pytest-mock - - hypothesis>=4.0 + - hypothesis>=3.58.0 - s3fs - pip - pyreadstat diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst index db7a6c9d8864e..042c97a0c98b1 100644 --- a/doc/source/whatsnew/v0.25.0.rst +++ b/doc/source/whatsnew/v0.25.0.rst @@ -746,7 +746,7 @@ Increased minimum versions for dependencies ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Due to dropping support for Python 2.7, a number of optional dependencies have updated minimum versions (:issue:`25725`, :issue:`24942`, :issue:`25752`). -Independently, some minimum supported versions of dependencies were updated (:issue:`23519`, :issue:`25554`, :issue:`27336`). +Independently, some minimum supported versions of dependencies were updated (:issue:`23519`, :issue:`25554`). If installed, we now require: +-----------------+-----------------+----------+ @@ -764,8 +764,6 @@ If installed, we now require: +-----------------+-----------------+----------+ | pytest (dev) | 4.0.2 | | +-----------------+-----------------+----------+ -| hypothesis | 4.0.0 | | -+-----------------+-----------------+----------+ For `optional libraries `_ the general recommendation is to use the latest version. The following table lists the lowest version per library that is currently being tested throughout the development of pandas. diff --git a/requirements-dev.txt b/requirements-dev.txt index 7dd228b305ce0..e49ad10bfc99d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -19,7 +19,7 @@ nbsphinx pandoc boto3 botocore>=1.11 -hypothesis>=4.0 +hypothesis>=3.82 moto pytest>=4.0.2 pytest-cov