diff --git a/.circleci/config.yml b/.circleci/config.yml index 4acc6473e6add..745b04a5159f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -54,7 +54,7 @@ jobs: /opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev . ~/virtualenvs/pandas-dev/bin/activate python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1 - python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1 + python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0 python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror" python -m pip list --no-cache-dir export PANDAS_CI=1 diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index a9585c17454fb..261859a14459a 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -227,7 +227,7 @@ jobs: . ~/virtualenvs/pandas-dev/bin/activate python -m pip install --no-cache-dir -U pip wheel setuptools meson[ninja]==1.2.1 meson-python==0.13.1 python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true" - python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1 + python -m pip install --no-cache-dir versioneer[toml] cython python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0 python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror" python -m pip list --no-cache-dir export PANDAS_CI=1 @@ -265,7 +265,7 @@ jobs: /opt/python/cp311-cp311/bin/python -m venv ~/virtualenvs/pandas-dev . ~/virtualenvs/pandas-dev/bin/activate python -m pip install --no-cache-dir -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.2.1 - python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 hypothesis>=6.46.1 + python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=3.4.0 hypothesis>=6.84.0 python -m pip install --no-cache-dir --no-build-isolation -e . --config-settings=setup-args="--werror" python -m pip list --no-cache-dir @@ -339,7 +339,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1 python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy python -m pip install versioneer[toml] - python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov + python -m pip install python-dateutil pytz tzdata cython hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror" python -m pip list @@ -382,7 +382,7 @@ jobs: python -m pip install --upgrade pip setuptools wheel meson[ninja]==1.2.1 meson-python==0.13.1 python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy cython python -m pip install versioneer[toml] - python -m pip install python-dateutil pytz tzdata hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov + python -m pip install python-dateutil pytz tzdata hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0 pytest-cov python -m pip install -ve . --no-build-isolation --no-index --no-deps --config-settings=setup-args="--werror" python -m pip list diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 02100648b636a..6405156f09833 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -178,7 +178,7 @@ jobs: shell: pwsh run: | $TST_CMD = @" - python -m pip install hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0; + python -m pip install hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0; python -m pip install `$(Get-Item pandas\wheelhouse\*.whl); python -c `'import pandas as pd; pd.test(extra_args=[`\"--no-strict-data-files`\", `\"-m not clipboard and not single_cpu and not slow and not network and not db`\"])`'; "@ diff --git a/ci/deps/actions-310-minimum_versions.yaml b/ci/deps/actions-310-minimum_versions.yaml index a9c205d24d212..0c46f476893dd 100644 --- a/ci/deps/actions-310-minimum_versions.yaml +++ b/ci/deps/actions-310-minimum_versions.yaml @@ -15,9 +15,9 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-localserver>=0.7.1 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-localserver>=0.8.1 + - pytest-qt>=4.4.0 - boto3 # required dependencies @@ -32,7 +32,7 @@ dependencies: - fastparquet=2023.10.0 - fsspec=2022.11.0 - html5lib=1.1 - - hypothesis=6.46.1 + - hypothesis=6.84.0 - gcsfs=2022.11.0 - jinja2=3.1.2 - lxml=4.9.2 diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index ed7dfe1a3c17e..0af46752f5b3d 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -13,8 +13,9 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-localserver>=0.8.1 + - pytest-qt>=4.4.0 - boto3 # required dependencies @@ -29,7 +30,7 @@ dependencies: - fastparquet>=2023.10.0 - fsspec>=2022.11.0 - html5lib>=1.1 - - hypothesis>=6.46.1 + - hypothesis>=6.84.0 - gcsfs>=2022.11.0 - jinja2>=3.1.2 - lxml>=4.9.2 @@ -60,4 +61,3 @@ dependencies: - adbc-driver-postgresql>=0.10.0 - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 - - pytest-localserver>=0.7.1 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index dd1d341c70a9b..1a842c7212c1f 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -14,9 +14,9 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-localserver>=0.7.1 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-localserver>=0.8.1 + - pytest-qt>=4.4.0 - boto3 # required dependencies @@ -31,7 +31,7 @@ dependencies: - fastparquet>=2023.10.0 - fsspec>=2022.11.0 - html5lib>=1.1 - - hypothesis>=6.46.1 + - hypothesis>=6.84.0 - gcsfs>=2022.11.0 - jinja2>=3.1.2 - lxml>=4.9.2 diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml index 61a0eabbf133c..748cfa861ec32 100644 --- a/ci/deps/actions-311-numpydev.yaml +++ b/ci/deps/actions-311-numpydev.yaml @@ -13,8 +13,8 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - hypothesis>=6.46.1 + - pytest-xdist>=3.4.0 + - hypothesis>=6.84.0 # pandas dependencies - python-dateutil diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml index 5455b9b84b034..469fb1bfb9138 100644 --- a/ci/deps/actions-311-pyarrownightly.yaml +++ b/ci/deps/actions-311-pyarrownightly.yaml @@ -13,8 +13,8 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - hypothesis>=6.46.1 + - pytest-xdist>=3.4.0 + - hypothesis>=6.84.0 # required dependencies - python-dateutil diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 388116439f944..75394e2c8e109 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -13,8 +13,9 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-localserver>=0.8.1 + - pytest-qt>=4.4.0 - boto3 # required dependencies @@ -29,7 +30,7 @@ dependencies: - fastparquet>=2023.10.0 - fsspec>=2022.11.0 - html5lib>=1.1 - - hypothesis>=6.46.1 + - hypothesis>=6.84.0 - gcsfs>=2022.11.0 - jinja2>=3.1.2 - lxml>=4.9.2 @@ -59,4 +60,3 @@ dependencies: - pip: - adbc-driver-postgresql>=0.10.0 - adbc-driver-sqlite>=0.8.0 - - pytest-localserver>=0.7.1 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 1d9f8aa3b092a..d4b43ddef3601 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -13,8 +13,9 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-localserver>=0.8.1 + - pytest-qt>=4.4.0 - boto3 # required dependencies @@ -29,7 +30,7 @@ dependencies: - fastparquet>=2023.10.0 - fsspec>=2022.11.0 - html5lib>=1.1 - - hypothesis>=6.46.1 + - hypothesis>=6.84.0 - gcsfs>=2022.11.0 - jinja2>=3.1.2 - lxml>=4.9.2 @@ -60,4 +61,3 @@ dependencies: - adbc-driver-postgresql>=0.10.0 - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 - - pytest-localserver>=0.7.1 diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml index d9c8dd81b7c33..b0ae9f1e48473 100644 --- a/ci/deps/actions-pypy-39.yaml +++ b/ci/deps/actions-pypy-39.yaml @@ -16,8 +16,8 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - hypothesis>=6.46.1 + - pytest-xdist>=3.4.0 + - hypothesis>=6.84.0 # required - numpy diff --git a/ci/deps/circle-311-arm64.yaml b/ci/deps/circle-311-arm64.yaml index 1c31d353699f8..18535d81e6985 100644 --- a/ci/deps/circle-311-arm64.yaml +++ b/ci/deps/circle-311-arm64.yaml @@ -13,9 +13,9 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-localserver>=0.7.1 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-localserver>=0.8.1 + - pytest-qt>=4.4.0 - boto3 # required dependencies @@ -30,7 +30,7 @@ dependencies: - fastparquet>=2023.10.0 - fsspec>=2022.11.0 - html5lib>=1.1 - - hypothesis>=6.46.1 + - hypothesis>=6.84.0 - gcsfs>=2022.11.0 - jinja2>=3.1.2 - lxml>=4.9.2 diff --git a/ci/meta.yaml b/ci/meta.yaml index aac5593e493b7..b76bef2f630b7 100644 --- a/ci/meta.yaml +++ b/ci/meta.yaml @@ -64,9 +64,9 @@ test: requires: - pip - pytest >=7.3.2 - - pytest-xdist >=2.2.0 + - pytest-xdist >=3.4.0 - pytest-cov - - hypothesis >=6.46.1 + - hypothesis >=6.84.0 - tomli # [py<311] about: diff --git a/environment.yml b/environment.yml index dcc7aa5280b2c..e5646af07c45c 100644 --- a/environment.yml +++ b/environment.yml @@ -15,8 +15,8 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 - - pytest-qt>=4.2.0 + - pytest-xdist>=3.4.0 + - pytest-qt>=4.4.0 - pytest-localserver - pyqt>=5.15.9 - coverage @@ -33,7 +33,7 @@ dependencies: - fastparquet>=2023.10.0 - fsspec>=2022.11.0 - html5lib>=1.1 - - hypothesis>=6.46.1 + - hypothesis>=6.84.0 - gcsfs>=2022.11.0 - ipython - jinja2>=3.1.2 diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index b62a4c8dcc8c8..06082e71af32a 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -28,7 +28,7 @@ "fastparquet": "2023.10.0", "fsspec": "2022.11.0", "html5lib": "1.1", - "hypothesis": "6.46.1", + "hypothesis": "6.84.0", "gcsfs": "2022.11.0", "jinja2": "3.1.2", "lxml.etree": "4.9.2", diff --git a/pandas/conftest.py b/pandas/conftest.py index 5e0dfd7ee644d..c36789d2950bc 100644 --- a/pandas/conftest.py +++ b/pandas/conftest.py @@ -76,7 +76,6 @@ Index, MultiIndex, ) -from pandas.util.version import Version if TYPE_CHECKING: from collections.abc import ( @@ -182,9 +181,10 @@ def pytest_collection_modifyitems(items, config) -> None: ignore_doctest_warning(item, path, message) -hypothesis_health_checks = [hypothesis.HealthCheck.too_slow] -if Version(hypothesis.__version__) >= Version("6.83.2"): - hypothesis_health_checks.append(hypothesis.HealthCheck.differing_executors) +hypothesis_health_checks = [ + hypothesis.HealthCheck.too_slow, + hypothesis.HealthCheck.differing_executors, +] # Hypothesis hypothesis.settings.register_profile( diff --git a/pyproject.toml b/pyproject.toml index 47fd540d67ab2..7d3b55ce63ee4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -58,7 +58,7 @@ repository = 'https://github.com/pandas-dev/pandas' matplotlib = "pandas:plotting._matplotlib" [project.optional-dependencies] -test = ['hypothesis>=6.46.1', 'pytest>=7.3.2', 'pytest-xdist>=2.2.0'] +test = ['hypothesis>=6.84.0', 'pytest>=7.3.2', 'pytest-xdist>=3.4.0'] pyarrow = ['pyarrow>=10.0.1'] performance = ['bottleneck>=1.3.6', 'numba>=0.56.4', 'numexpr>=2.8.4'] computation = ['scipy>=1.10.0', 'xarray>=2022.12.0'] @@ -91,7 +91,7 @@ all = ['adbc-driver-postgresql>=0.10.0', 'fsspec>=2022.11.0', 'gcsfs>=2022.11.0', 'html5lib>=1.1', - 'hypothesis>=6.46.1', + 'hypothesis>=6.84.0', 'jinja2>=3.1.2', 'lxml>=4.9.2', 'matplotlib>=3.6.3', @@ -105,7 +105,7 @@ all = ['adbc-driver-postgresql>=0.10.0', 'PyQt5>=5.15.9', 'pyreadstat>=1.2.0', 'pytest>=7.3.2', - 'pytest-xdist>=2.2.0', + 'pytest-xdist>=3.4.0', 'python-calamine>=0.1.7', 'pyxlsb>=1.0.10', 'qtpy>=2.3.0', @@ -148,7 +148,7 @@ setup = ['--vsenv'] # For Windows skip = "cp36-* cp37-* cp38-* cp39-* pp* *_i686 *_ppc64le *_s390x" build-verbosity = "3" environment = {LDFLAGS="-Wl,--strip-all"} -test-requires = "hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0" +test-requires = "hypothesis>=6.84.0 pytest>=7.3.2 pytest-xdist>=3.4.0" test-command = """ PANDAS_CI='1' python -c 'import pandas as pd; \ pd.test(extra_args=["-m not clipboard and not single_cpu and not slow and not network and not db", "-n 2", "--no-strict-data-files"]); \ @@ -179,7 +179,7 @@ environment = {CFLAGS="-g0"} [[tool.cibuildwheel.overrides]] select = "*pyodide*" -test-requires = "pytest>=7.3.2 hypothesis>=6.46.1" +test-requires = "pytest>=7.3.2 hypothesis>=6.84.0" # Pyodide repairs wheels on its own, using auditwheel-emscripten repair-wheel-command = "" test-command = """ diff --git a/requirements-dev.txt b/requirements-dev.txt index f5da7f70ccdba..dbfd7c6bf7bf5 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,8 +8,8 @@ meson[ninja]==1.2.1 meson-python==0.13.1 pytest>=7.3.2 pytest-cov -pytest-xdist>=2.2.0 -pytest-qt>=4.2.0 +pytest-xdist>=3.4.0 +pytest-qt>=4.4.0 pytest-localserver PyQt5>=5.15.9 coverage @@ -22,7 +22,7 @@ bottleneck>=1.3.6 fastparquet>=2023.10.0 fsspec>=2022.11.0 html5lib>=1.1 -hypothesis>=6.46.1 +hypothesis>=6.84.0 gcsfs>=2022.11.0 ipython jinja2>=3.1.2 diff --git a/scripts/tests/data/deps_expected_random.yaml b/scripts/tests/data/deps_expected_random.yaml index 7bb95d05afb45..d1db7989a95a4 100644 --- a/scripts/tests/data/deps_expected_random.yaml +++ b/scripts/tests/data/deps_expected_random.yaml @@ -12,7 +12,7 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 + - pytest-xdist>=3.4.0 - psutil - boto3 diff --git a/scripts/tests/data/deps_minimum.toml b/scripts/tests/data/deps_minimum.toml index b832b6aa95198..0a53225a5d995 100644 --- a/scripts/tests/data/deps_minimum.toml +++ b/scripts/tests/data/deps_minimum.toml @@ -53,7 +53,7 @@ repository = 'https://github.com/pandas-dev/pandas' matplotlib = "pandas:plotting._matplotlib" [project.optional-dependencies] -test = ['hypothesis>=6.34.2', 'pytest>=7.3.2', 'pytest-xdist>=2.2.0'] +test = ['hypothesis>=6.34.2', 'pytest>=7.3.2', 'pytest-xdist>=3.4.0'] performance = ['bottleneck>=1.3.2', 'numba>=0.53.1', 'numexpr>=2.7.1'] timezone = ['tzdata>=2022.1'] computation = ['scipy>=1.7.1', 'xarray>=0.21.0'] @@ -74,7 +74,7 @@ html = ['beautifulsoup4>=4.9.3', 'html5lib>=1.1', 'lxml>=4.6.3'] xml = ['lxml>=4.6.3'] plot = ['matplotlib>=3.6.1'] output_formatting = ['jinja2>=3.0.0', 'tabulate>=0.8.9'] -clipboard = ['PyQt5>=5.15.1', 'qtpy>=2.2.0'] +clipboard = ['PyQt5>=5.15.1', 'qtpy>=2.3.0'] compression = ['zstandard>=0.15.2'] all = ['beautifulsoup4>=5.9.3', # blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297) @@ -98,10 +98,10 @@ all = ['beautifulsoup4>=5.9.3', 'PyQt5>=5.15.1', 'pyreadstat>=1.1.2', 'pytest>=7.3.2', - 'pytest-xdist>=2.2.0', + 'pytest-xdist>=3.4.0', 'python-calamine>=0.1.7', 'pyxlsb>=1.0.8', - 'qtpy>=2.2.0', + 'qtpy>=2.3.0', 'scipy>=1.7.1', 's3fs>=2021.08.0', 'SQLAlchemy>=1.4.16', @@ -138,7 +138,7 @@ parentdir_prefix = "pandas-" [tool.cibuildwheel] skip = "cp36-* cp37-* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux*" build-verbosity = "3" -test-requires = "hypothesis>=6.34.2 pytest>=7.3.2 pytest-xdist>=2.2.0" +test-requires = "hypothesis>=6.34.2 pytest>=7.3.2 pytest-xdist>=3.4.0" test-command = "python {project}/ci/test_wheels.py" [tool.cibuildwheel.macos] diff --git a/scripts/tests/data/deps_unmodified_random.yaml b/scripts/tests/data/deps_unmodified_random.yaml index 49299aa078ce4..afb28dd2c08bb 100644 --- a/scripts/tests/data/deps_unmodified_random.yaml +++ b/scripts/tests/data/deps_unmodified_random.yaml @@ -12,7 +12,7 @@ dependencies: # test dependencies - pytest>=7.3.2 - pytest-cov - - pytest-xdist>=2.2.0 + - pytest-xdist>=3.4.0 - psutil - boto3