Skip to content

Commit 4d10b87

Browse files
lithomas1lithomas1
authored
Backport PR #45120: CI: Migrate Python 3.10 testing to Posix GHA/Azure Pipelines (#45464)
1 parent 2dcad01 commit 4d10b87

17 files changed

+195
-109
lines changed

‎.github/workflows/posix.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@ jobs:
2828
[actions-38-downstream_compat.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
2929
[actions-38-minimum_versions.yaml, "slow", "", "", "", "", ""],
3030
[actions-38-minimum_versions.yaml, "not slow and not network and not clipboard", "", "", "", "", ""],
31-
[actions-38-locale_slow.yaml, "slow", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
31+
[actions-38.yaml, "not slow and not network", "language-pack-it xsel", "it_IT.utf8", "it_IT.utf8", "", ""],
32+
[actions-38.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
3233
[actions-38.yaml, "not slow and not clipboard", "", "", "", "", ""],
33-
[actions-38-slow.yaml, "slow", "", "", "", "", ""],
34-
[actions-38-locale.yaml, "not slow and not network", "language-pack-zh-hans xsel", "zh_CN.utf8", "zh_CN.utf8", "", ""],
35-
[actions-39-slow.yaml, "slow", "", "", "", "", ""],
34+
[actions-38.yaml, "slow", "", "", "", "", ""],
3635
[actions-pypy-38.yaml, "not slow and not clipboard", "", "", "", "", "--max-worker-restart 0"],
37-
[actions-39-numpydev.yaml, "not slow and not network", "xsel", "", "", "deprecate", "-W error"],
38-
[actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""]
36+
[actions-39.yaml, "slow", "", "", "", "", ""],
37+
[actions-39.yaml, "not slow and not clipboard", "", "", "", "", ""],
38+
[actions-310-numpydev.yaml, "not slow and not network", "xclip", "", "", "deprecate", "-W error"],
39+
[actions-310.yaml, "not slow and not clipboard", "", "", "", "", ""],
40+
[actions-310.yaml, "slow", "", "", "", "", ""],
3941
]
4042
fail-fast: false
4143
env:
@@ -52,7 +54,7 @@ jobs:
5254
COVERAGE: ${{ !contains(matrix.settings[0], 'pypy') }}
5355
concurrency:
5456
# https://github.community/t/concurrecy-not-work-for-push/183068/7
55-
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}
57+
group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.settings[0] }}-${{ matrix.settings[1] }}
5658
cancel-in-progress: true
5759

5860
services:

‎.github/workflows/python-dev.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# This file is purposely frozen(does not run). DO NOT DELETE IT
2+
# Unfreeze(by commentingthe if: false() condition) once the
3+
# next Python Dev version has released beta 1 and both Cython and numpy support it
4+
# After that Python has released, migrate the workflows to the
5+
# posix GHA workflows/Azure pipelines and "freeze" this file by
6+
# uncommenting the if: false() condition
7+
# Feel free to modify this comment as necessary.
8+
19
name: Python Dev
210

311
on:
@@ -21,13 +29,14 @@ env:
2129

2230
jobs:
2331
build:
32+
if: false # Comment this line out to "unfreeze"
2433
runs-on: ${{ matrix.os }}
2534
strategy:
2635
fail-fast: false
2736
matrix:
2837
os: [ubuntu-latest, macOS-latest, windows-latest]
2938

30-
name: actions-310-dev
39+
name: actions-311-dev
3140
timeout-minutes: 80
3241

3342
concurrency:
@@ -43,7 +52,7 @@ jobs:
4352
- name: Set up Python Dev Version
4453
uses: actions/setup-python@v2
4554
with:
46-
python-version: '3.10-dev'
55+
python-version: '3.11-dev'
4756

4857
# TODO: GH#44980 https://github.com/pypa/setuptools/issues/2941
4958
- name: Install dependencies

‎ci/azure/posix.yml

+20
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,26 @@ jobs:
1818
CONDA_PY: "38"
1919
PATTERN: "not slow"
2020
PYTEST_TARGET: "pandas/tests/[i-z]*"
21+
py39_macos_1:
22+
ENV_FILE: ci/deps/azure-macos-39.yaml
23+
CONDA_PY: "39"
24+
PATTERN: "not slow"
25+
PYTEST_TARGET: "pandas/tests/[a-h]*"
26+
py39_macos_2:
27+
ENV_FILE: ci/deps/azure-macos-39.yaml
28+
CONDA_PY: "39"
29+
PATTERN: "not slow"
30+
PYTEST_TARGET: "pandas/tests/[i-z]*"
31+
py310_macos_1:
32+
ENV_FILE: ci/deps/azure-macos-310.yaml
33+
CONDA_PY: "310"
34+
PATTERN: "not slow"
35+
PYTEST_TARGET: "pandas/tests/[a-h]*"
36+
py310_macos_2:
37+
ENV_FILE: ci/deps/azure-macos-310.yaml
38+
CONDA_PY: "310"
39+
PATTERN: "not slow"
40+
PYTEST_TARGET: "pandas/tests/[i-z]*"
2141

2242
steps:
2343
- script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'

‎ci/azure/windows.yml

+14
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@ jobs:
3636
PYTEST_WORKERS: 2 # GH-42236
3737
PYTEST_TARGET: "pandas/tests/[i-z]*"
3838

39+
py310_1:
40+
ENV_FILE: ci/deps/azure-windows-310.yaml
41+
CONDA_PY: "310"
42+
PATTERN: "not slow and not high_memory"
43+
PYTEST_WORKERS: 2 # GH-42236
44+
PYTEST_TARGET: "pandas/tests/[a-h]*"
45+
46+
py310_2:
47+
ENV_FILE: ci/deps/azure-windows-310.yaml
48+
CONDA_PY: "310"
49+
PATTERN: "not slow and not high_memory"
50+
PYTEST_WORKERS: 2 # GH-42236
51+
PYTEST_TARGET: "pandas/tests/[i-z]*"
52+
3953
steps:
4054
- powershell: |
4155
Write-Host "##vso[task.prependpath]$env:CONDA\Scripts"

‎ci/deps/actions-39-numpydev.yaml renamed to ‎ci/deps/actions-310-numpydev.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: pandas-dev
22
channels:
33
- defaults
44
dependencies:
5-
- python=3.9
5+
- python=3.10
66

77
# tools
88
- pytest>=6.0

‎ci/deps/actions-310.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: pandas-dev
2+
channels:
3+
- conda-forge
4+
dependencies:
5+
- python=3.9
6+
7+
# test dependencies
8+
- cython=0.29.24
9+
- pytest>=6.0
10+
- pytest-cov
11+
- pytest-xdist>=1.31
12+
- hypothesis>=5.5.3
13+
- psutil
14+
15+
# required dependencies
16+
- python-dateutil
17+
- numpy
18+
- pytz
19+
20+
# optional dependencies
21+
- beautifulsoup4
22+
- blosc
23+
- bottleneck
24+
- fastparquet
25+
- fsspec
26+
- html5lib
27+
- gcsfs
28+
- jinja2
29+
- lxml
30+
- matplotlib
31+
# TODO: uncomment after numba supports py310
32+
#- numba
33+
- numexpr
34+
- openpyxl
35+
- odfpy
36+
- pandas-gbq
37+
- psycopg2
38+
- pymysql
39+
- pytables
40+
- pyarrow
41+
- pyreadstat
42+
- pyxlsb
43+
- s3fs
44+
- scipy
45+
- sqlalchemy
46+
- tabulate
47+
- xarray
48+
- xlrd
49+
- xlsxwriter
50+
- xlwt
51+
- zstandard

‎ci/deps/actions-38-locale_slow.yaml

-30
This file was deleted.

‎ci/deps/actions-38.yaml

+36-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,50 @@
11
name: pandas-dev
22
channels:
3-
- defaults
43
- conda-forge
54
dependencies:
65
- python=3.8
76

8-
# tools
9-
- cython>=0.29.24
7+
# test dependencies
8+
- cython=0.29.24
109
- pytest>=6.0
1110
- pytest-cov
1211
- pytest-xdist>=1.31
1312
- hypothesis>=5.5.3
13+
- psutil
1414

15-
# pandas dependencies
16-
- numpy
15+
# required dependencies
1716
- python-dateutil
18-
- nomkl
17+
- numpy
1918
- pytz
19+
20+
# optional dependencies
21+
- beautifulsoup4
22+
- blosc
23+
- bottleneck
24+
- fastparquet
25+
- fsspec
26+
- html5lib
27+
- gcsfs
28+
- jinja2
29+
- lxml
30+
- matplotlib
31+
- numba
32+
- numexpr
33+
- openpyxl
34+
- odfpy
35+
- pandas-gbq
36+
- psycopg2
37+
- pymysql
38+
- pytables
39+
- pyarrow
40+
- pyreadstat
41+
- pyxlsb
42+
- s3fs
43+
- scipy
44+
- sqlalchemy
2045
- tabulate
46+
- xarray
47+
- xlrd
48+
- xlsxwriter
49+
- xlwt
50+
- zstandard

‎ci/deps/actions-38-locale.yaml renamed to ‎ci/deps/azure-macos-310.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
name: pandas-dev
22
channels:
3+
- defaults
34
- conda-forge
45
dependencies:
5-
- python=3.8
6+
- python=3.10
67

78
# tools
89
- cython>=0.29.24
910
- pytest>=6.0
10-
- pytest-cov
1111
- pytest-xdist>=1.31
12-
- pytest-asyncio>=0.12.0
1312
- hypothesis>=5.5.3
13+
- pytest-azurepipelines
1414

1515
# pandas dependencies
1616
- beautifulsoup4
17+
- bottleneck
1718
- html5lib
18-
- ipython
1919
- jinja2
20-
- jedi
2120
- lxml
2221
- matplotlib
2322
- nomkl
2423
- numexpr
25-
- numpy<1.20 # GH#39541 compat with pyarrow<3
24+
- numpy
2625
- openpyxl
26+
- pyarrow
27+
- pyreadstat
2728
- pytables
28-
- python-dateutil
29+
- python-dateutil==2.8.1
2930
- pytz
30-
- scipy
31+
- pyxlsb
3132
- xarray
3233
- xlrd
3334
- xlsxwriter
3435
- xlwt
35-
- pyarrow=4
36-
- pyxlsb
36+
- zstandard

‎ci/deps/azure-macos-38.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies:
66
- python=3.8
77

88
# tools
9+
- cython>=0.29.24
910
- pytest>=6.0
1011
- pytest-xdist>=1.31
1112
- hypothesis>=5.5.3
@@ -33,6 +34,3 @@ dependencies:
3334
- xlsxwriter
3435
- xlwt
3536
- zstandard
36-
- pip
37-
- pip:
38-
- cython>=0.29.24

‎ci/deps/actions-38-slow.yaml renamed to ‎ci/deps/azure-macos-39.yaml

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,36 @@
11
name: pandas-dev
22
channels:
3+
- defaults
34
- conda-forge
45
dependencies:
5-
- python=3.8
6+
- python=3.9
67

78
# tools
89
- cython>=0.29.24
910
- pytest>=6.0
10-
- pytest-cov
1111
- pytest-xdist>=1.31
1212
- hypothesis>=5.5.3
13+
- pytest-azurepipelines
1314

1415
# pandas dependencies
1516
- beautifulsoup4
16-
- boto3
17-
- fsspec>=0.7.4
17+
- bottleneck
1818
- html5lib
19+
- jinja2
1920
- lxml
20-
- matplotlib
21+
- matplotlib=3.3.2
22+
- nomkl
2123
- numexpr
22-
- numpy
24+
- numpy=1.21.3
2325
- openpyxl
24-
- patsy
25-
- psycopg2
26-
- pymysql
26+
- pyarrow=1.0.1
27+
- pyreadstat
2728
- pytables
28-
- python-dateutil
29+
- python-dateutil==2.8.1
2930
- pytz
30-
- s3fs>=0.4.0
31-
- scipy
32-
- sqlalchemy
31+
- pyxlsb
32+
- xarray
3333
- xlrd
3434
- xlsxwriter
3535
- xlwt
36-
- numba
3736
- zstandard

0 commit comments

Comments
 (0)