diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 541b36d9b4c1d..bd104af4a8d9e 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -230,7 +230,7 @@ jobs: /opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev . ~/virtualenvs/pandas-dev/bin/activate python -m pip install -U pip wheel setuptools meson[ninja]==1.0.1 meson-python==0.13.1 - python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1 + python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1 python -m pip install --no-cache-dir --no-build-isolation -e . python -m pip list --no-cache-dir export PANDAS_CI=1 @@ -268,7 +268,7 @@ jobs: /opt/python/cp39-cp39/bin/python -m venv ~/virtualenvs/pandas-dev . ~/virtualenvs/pandas-dev/bin/activate python -m pip install -U pip wheel setuptools meson-python==0.13.1 meson[ninja]==1.0.1 - python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1 + python -m pip install --no-cache-dir versioneer[toml] cython numpy python-dateutil pytz pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17 hypothesis>=6.46.1 python -m pip install --no-cache-dir --no-build-isolation -e . python -m pip list --no-cache-dir @@ -340,7 +340,7 @@ jobs: python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scientific-python-nightly-wheels/simple numpy python -m pip install git+https://github.com/nedbat/coveragepy.git python -m pip install versioneer[toml] - python -m pip install python-dateutil pytz cython hypothesis>=6.46.1 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17 + python -m pip install python-dateutil pytz cython hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-cov pytest-asyncio>=0.17 python -m pip list - name: Build Pandas diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index eae2949594bcc..f1f9646054132 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -140,7 +140,7 @@ jobs: shell: pwsh run: | $TST_CMD = @" - python -m pip install pytz six numpy python-dateutil tzdata>=2022.1 hypothesis>=6.46.1 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17; + python -m pip install pytz six numpy python-dateutil tzdata>=2022.1 hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17; python -m pip install --find-links=pandas\wheelhouse --no-index pandas; python -c `'import pandas as pd; pd.test()`'; "@ diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 91999e151dfd7..0923594f2c840 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -11,7 +11,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 2115ee8f7d86a..51c7a97ad6500 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -12,7 +12,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/ci/deps/actions-311-numpydev.yaml b/ci/deps/actions-311-numpydev.yaml index 5379c2fddec21..2cd4d5f3528f8 100644 --- a/ci/deps/actions-311-numpydev.yaml +++ b/ci/deps/actions-311-numpydev.yaml @@ -10,7 +10,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov # Once pytest-cov > 4 comes out, unpin this # Right now, a DeprecationWarning related to rsyncdir diff --git a/ci/deps/actions-311-pyarrownightly.yaml b/ci/deps/actions-311-pyarrownightly.yaml index 7a82fde475a4b..f24e866af0439 100644 --- a/ci/deps/actions-311-pyarrownightly.yaml +++ b/ci/deps/actions-311-pyarrownightly.yaml @@ -11,7 +11,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - hypothesis>=6.46.1 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 215b3a7309bf4..66b8650116854 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -11,7 +11,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index 72c7cef5326c3..e1b4fdfb1d897 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -13,7 +13,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 78a0a2097ede6..8ff47dbb9cc95 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -11,7 +11,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/ci/deps/actions-pypy-39.yaml b/ci/deps/actions-pypy-39.yaml index 591ce33fc18af..035395d55eb3a 100644 --- a/ci/deps/actions-pypy-39.yaml +++ b/ci/deps/actions-pypy-39.yaml @@ -14,7 +14,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-asyncio>=0.17.0 - pytest-xdist>=2.2.0 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index 1813dbe3a1df5..ca9860fc20742 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -11,7 +11,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/ci/meta.yaml b/ci/meta.yaml index f02c7eec001fc..09ae0d7253bf7 100644 --- a/ci/meta.yaml +++ b/ci/meta.yaml @@ -62,7 +62,7 @@ test: - python -c "import pandas; pandas.test(extra_args={{ extra_args }})" # [python_impl == "cpython"] requires: - pip - - pytest >=7.0.0 + - pytest >=7.3.2 - pytest-asyncio >=0.17.0 - pytest-xdist >=2.2.0 - pytest-cov diff --git a/environment.yml b/environment.yml index fb8321a9fb6a7..6178fe896760f 100644 --- a/environment.yml +++ b/environment.yml @@ -13,7 +13,7 @@ dependencies: - meson-python=0.13.1 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - pytest-asyncio>=0.17.0 diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index ef511828126f8..dcd49f65fc4cd 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -36,7 +36,7 @@ "pymysql": "1.0.2", "pyarrow": "7.0.0", "pyreadstat": "1.1.5", - "pytest": "7.0.0", + "pytest": "7.3.2", "pyxlsb": "1.0.9", "s3fs": "2022.05.0", "scipy": "1.8.1", diff --git a/pyproject.toml b/pyproject.toml index 6f91aa2360406..0d1bca886a638 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ repository = 'https://github.com/pandas-dev/pandas' matplotlib = "pandas:plotting._matplotlib" [project.optional-dependencies] -test = ['hypothesis>=6.46.1', 'pytest>=7.0.0', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0'] +test = ['hypothesis>=6.46.1', 'pytest>=7.3.2', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0'] performance = ['bottleneck>=1.3.4', 'numba>=0.55.2', 'numexpr>=2.8.0'] computation = ['scipy>=1.8.1', 'xarray>=2022.03.0'] fss = ['fsspec>=2022.05.0'] @@ -101,7 +101,7 @@ all = ['beautifulsoup4>=4.11.1', 'pymysql>=1.0.2', 'PyQt5>=5.15.6', 'pyreadstat>=1.1.5', - 'pytest>=7.0.0', + 'pytest>=7.3.2', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0', 'python-snappy>=0.6.1', @@ -146,7 +146,7 @@ setup = ['--vsenv'] # For Windows skip = "cp36-* cp37-* cp38-* pp* *_i686 *_ppc64le *_s390x *-musllinux_aarch64" build-verbosity = "3" environment = {LDFLAGS="-Wl,--strip-all"} -test-requires = "hypothesis>=6.46.1 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17" +test-requires = "hypothesis>=6.46.1 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17" 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"]); \ diff --git a/requirements-dev.txt b/requirements-dev.txt index 546116b1fa23d..38a2ce7f66aa3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ versioneer[toml] cython==0.29.33 meson[ninja]==1.0.1 meson-python==0.13.1 -pytest>=7.0.0 +pytest>=7.3.2 pytest-cov pytest-xdist>=2.2.0 pytest-asyncio>=0.17.0 diff --git a/scripts/tests/conftest.py b/scripts/tests/conftest.py deleted file mode 100644 index 496a5195bfc84..0000000000000 --- a/scripts/tests/conftest.py +++ /dev/null @@ -1,6 +0,0 @@ -def pytest_addoption(parser): - parser.addoption( - "--strict-data-files", - action="store_true", - help="Unused. For compat with setup.cfg.", - ) diff --git a/scripts/tests/data/deps_expected_random.yaml b/scripts/tests/data/deps_expected_random.yaml index be5e467b57e10..35d7fe74806a9 100644 --- a/scripts/tests/data/deps_expected_random.yaml +++ b/scripts/tests/data/deps_expected_random.yaml @@ -10,7 +10,7 @@ dependencies: - cython>=0.29.32 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - psutil diff --git a/scripts/tests/data/deps_minimum.toml b/scripts/tests/data/deps_minimum.toml index 97a5ce1180bfb..6f56ca498794b 100644 --- a/scripts/tests/data/deps_minimum.toml +++ b/scripts/tests/data/deps_minimum.toml @@ -55,7 +55,7 @@ repository = 'https://github.com/pandas-dev/pandas' matplotlib = "pandas:plotting._matplotlib" [project.optional-dependencies] -test = ['hypothesis>=6.34.2', 'pytest>=7.0.0', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0'] +test = ['hypothesis>=6.34.2', 'pytest>=7.3.2', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.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'] @@ -101,7 +101,7 @@ all = ['beautifulsoup4>=5.9.3', 'pymysql>=1.0.2', 'PyQt5>=5.15.1', 'pyreadstat>=1.1.2', - 'pytest>=7.0.0', + 'pytest>=7.3.2', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0', 'python-snappy>=0.6.0', @@ -143,7 +143,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.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17" +test-requires = "hypothesis>=6.34.2 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17" 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 4ca758af1c8ad..405762d33f53e 100644 --- a/scripts/tests/data/deps_unmodified_random.yaml +++ b/scripts/tests/data/deps_unmodified_random.yaml @@ -10,7 +10,7 @@ dependencies: - cython>=0.29.32 # test dependencies - - pytest>=7.0.0 + - pytest>=7.3.2 - pytest-cov - pytest-xdist>=2.2.0 - psutil