Skip to content

Commit 71c9a17

Browse files
authored
Backport PR #53727 on branch 2.0.x (CI: fix pytest scripts) (#53732)
CI: fix `pytest scripts` (#53727) (cherry picked from commit 3fb757b)
1 parent fbb97d0 commit 71c9a17

18 files changed

+20
-26
lines changed

.github/workflows/unit-tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
/opt/python/cp38-cp38/bin/python -m venv ~/virtualenvs/pandas-dev
231231
. ~/virtualenvs/pandas-dev/bin/activate
232232
python -m pip install --no-cache-dir --no-deps -U pip wheel setuptools
233-
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
233+
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
234234
python setup.py build_ext -q -j$(nproc)
235235
python -m pip install --no-cache-dir --no-build-isolation --no-use-pep517 -e .
236236
python -m pip list
@@ -299,7 +299,7 @@ jobs:
299299
python -m pip install --pre --extra-index-url https://pypi.anaconda.org/scipy-wheels-nightly/simple numpy
300300
python -m pip install git+https://github.com/nedbat/coveragepy.git
301301
python -m pip install versioneer[toml]
302-
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
302+
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
303303
python -m pip list
304304
305305
- name: Build Pandas

.github/workflows/wheels.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
# (1. Generate sdist 2. Build wheels from sdist)
174174
# This tests the sdists, and saves some build time
175175
python -m pip install dist/*.gz
176-
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
176+
pip install hypothesis>=6.34.2 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
177177
cd .. # Not a good idea to test within the src tree
178178
python -c "import pandas; print(pandas.__version__);
179179
pandas.test(extra_args=['-m not clipboard and not single_cpu', '--skip-slow', '--skip-network', '--skip-db', '-n=2']);

ci/deps/actions-310.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cython>=0.29.33
1010

1111
# test dependencies
12-
- pytest>=7.0.0
12+
- pytest>=7.3.2
1313
- pytest-cov
1414
- pytest-xdist>=2.2.0
1515
- pytest-asyncio>=0.17

ci/deps/actions-311-downstream_compat.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ dependencies:
1010
- cython>=0.29.33
1111

1212
# test dependencies
13-
- pytest>=7.0.0
13+
- pytest>=7.3.2
1414
- pytest-cov
1515
- pytest-xdist>=2.2.0
1616
- pytest-asyncio>=0.17

ci/deps/actions-311-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies:
88
- versioneer[toml]
99

1010
# test dependencies
11-
- pytest>=7.0.0
11+
- pytest>=7.3.2
1212
- pytest-cov
1313
- pytest-xdist>=2.2.0
1414
- hypothesis>=6.34.2

ci/deps/actions-311-pyarrownightly.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cython>=0.29.33
1010

1111
# test dependencies
12-
- pytest>=7.0.0
12+
- pytest>=7.3.2
1313
- pytest-cov
1414
- pytest-xdist>=2.2.0
1515
- hypothesis>=6.34.2

ci/deps/actions-38-minimum_versions.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- cython>=0.29.33
1212

1313
# test dependencies
14-
- pytest>=7.0.0
14+
- pytest>=7.3.2
1515
- pytest-cov
1616
- pytest-xdist>=2.2.0
1717
- pytest-asyncio>=0.17

ci/deps/actions-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cython>=0.29.33
1010

1111
# test dependencies
12-
- pytest>=7.0.0
12+
- pytest>=7.3.2
1313
- pytest-cov
1414
- pytest-xdist>=2.2.0
1515
- pytest-asyncio>=0.17

ci/deps/actions-39.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cython>=0.29.33
1010

1111
# test dependencies
12-
- pytest>=7.0.0
12+
- pytest>=7.3.2
1313
- pytest-cov
1414
- pytest-xdist>=2.2.0
1515
- pytest-asyncio>=0.17

ci/deps/actions-pypy-38.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- cython>=0.29.33
1313

1414
# test dependencies
15-
- pytest>=7.0.0
15+
- pytest>=7.3.2
1616
- pytest-cov
1717
- pytest-asyncio
1818
- pytest-xdist>=2.2.0

ci/deps/circle-310-arm64.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ dependencies:
99
- cython>=0.29.33
1010

1111
# test dependencies
12-
- pytest>=7.0.0
12+
- pytest>=7.3.2
1313
- pytest-cov
1414
- pytest-xdist>=2.2.0
1515
- pytest-asyncio>=0.17

ci/meta.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ test:
6262
- python -c "import pandas; pandas.test(extra_args={{ extra_args }})" # [python_impl == "cpython"]
6363
requires:
6464
- pip
65-
- pytest >=7.0.0
65+
- pytest >=7.3.2
6666
- pytest-asyncio >=0.17.0
6767
- pytest-xdist >=2.2.0
6868
- pytest-cov

ci/test_wheels_windows.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ pd.test(extra_args=['-m not clipboard and single_cpu', '--skip-slow', '--skip-ne
44

55
python --version
66
pip install pytz six numpy python-dateutil tzdata>=2022.1
7-
pip install hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
7+
pip install hypothesis>=6.34.2 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17
88
pip install --find-links=pandas/dist --no-index pandas
99
python -c "%test_command%"

environment.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies:
1111
- cython=0.29.33
1212

1313
# test dependencies
14-
- pytest>=7.0.0
14+
- pytest>=7.3.2
1515
- pytest-cov
1616
- pytest-xdist>=2.2.0
1717
- pytest-asyncio>=0.17

pandas/compat/_optional.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"pymysql": "1.0.2",
3434
"pyarrow": "7.0.0",
3535
"pyreadstat": "1.1.2",
36-
"pytest": "7.0.0",
36+
"pytest": "7.3.2",
3737
"pyxlsb": "1.0.8",
3838
"s3fs": "2021.08.0",
3939
"scipy": "1.7.1",

pyproject.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ repository = 'https://github.com/pandas-dev/pandas'
5656
matplotlib = "pandas:plotting._matplotlib"
5757

5858
[project.optional-dependencies]
59-
test = ['hypothesis>=6.34.2', 'pytest>=7.0.0', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0']
59+
test = ['hypothesis>=6.34.2', 'pytest>=7.3.2', 'pytest-xdist>=2.2.0', 'pytest-asyncio>=0.17.0']
6060
performance = ['bottleneck>=1.3.2', 'numba>=0.53.1', 'numexpr>=2.7.1']
6161
computation = ['scipy>=1.7.1', 'xarray>=0.21.0']
6262
fss = ['fsspec>=2021.07.0']
@@ -101,7 +101,7 @@ all = ['beautifulsoup4>=4.9.3',
101101
'pymysql>=1.0.2',
102102
'PyQt5>=5.15.1',
103103
'pyreadstat>=1.1.2',
104-
'pytest>=7.0.0',
104+
'pytest>=7.3.2',
105105
'pytest-xdist>=2.2.0',
106106
'pytest-asyncio>=0.17.0',
107107
'python-snappy>=0.6.0',
@@ -143,7 +143,7 @@ parentdir_prefix = "pandas-"
143143
skip = "cp36-* cp37-* pp37-* *-manylinux_i686 *_ppc64le *_s390x *-musllinux*"
144144
build-verbosity = "3"
145145
environment = {LDFLAGS="-Wl,--strip-all" }
146-
test-requires = "hypothesis>=6.34.2 pytest>=7.0.0 pytest-xdist>=2.2.0 pytest-asyncio>=0.17"
146+
test-requires = "hypothesis>=6.34.2 pytest>=7.3.2 pytest-xdist>=2.2.0 pytest-asyncio>=0.17"
147147
test-command = "python {project}/ci/test_wheels.py"
148148

149149
[tool.cibuildwheel.macos]

requirements-dev.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
pip
55
versioneer[toml]
66
cython==0.29.33
7-
pytest>=7.0.0
7+
pytest>=7.3.2
88
pytest-cov
99
pytest-xdist>=2.2.0
1010
pytest-asyncio>=0.17

scripts/tests/conftest.py

-6
This file was deleted.

0 commit comments

Comments
 (0)