Skip to content

Commit 6a5cdf5

Browse files
authored
CI: Align GHA and Windows Azure dependencies (#45856)
1 parent da1d6ba commit 6a5cdf5

File tree

5 files changed

+10
-153
lines changed

5 files changed

+10
-153
lines changed

azure-pipelines.yml

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ pr:
1818
variables:
1919
PYTEST_WORKERS: auto
2020
PYTEST_TARGET: pandas
21+
PATTERN: "not slow and not high_memory and not db and not network"
22+
PANDAS_CI: 1
2123

2224
jobs:
2325
# Mac and Linux use the same template

ci/azure/windows.yml

+8-37
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,22 @@ parameters:
44

55
jobs:
66
- job: ${{ parameters.name }}
7+
timeoutInMinutes: 90
78
pool:
89
vmImage: ${{ parameters.vmImage }}
910
strategy:
1011
matrix:
11-
py38_np18_1:
12-
ENV_FILE: ci/deps/azure-windows-38.yaml
12+
py38:
13+
ENV_FILE: ci/deps/actions-38.yaml
1314
CONDA_PY: "38"
14-
PATTERN: "not slow"
15-
PYTEST_WORKERS: 2 # GH-42236
16-
PYTEST_TARGET: "pandas/tests/[a-h]*"
1715

18-
py38_np18_2:
19-
ENV_FILE: ci/deps/azure-windows-38.yaml
20-
CONDA_PY: "38"
21-
PATTERN: "not slow"
22-
PYTEST_WORKERS: 2 # GH-42236
23-
PYTEST_TARGET: "pandas/tests/[i-z]*"
24-
25-
py39_1:
26-
ENV_FILE: ci/deps/azure-windows-39.yaml
27-
CONDA_PY: "39"
28-
PATTERN: "not slow and not high_memory"
29-
PYTEST_WORKERS: 2 # GH-42236
30-
PYTEST_TARGET: "pandas/tests/[a-h]*"
31-
32-
py39_2:
33-
ENV_FILE: ci/deps/azure-windows-39.yaml
16+
py39:
17+
ENV_FILE: ci/deps/actions-39.yaml
3418
CONDA_PY: "39"
35-
PATTERN: "not slow and not high_memory"
36-
PYTEST_WORKERS: 2 # GH-42236
37-
PYTEST_TARGET: "pandas/tests/[i-z]*"
38-
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]*"
4519

46-
py310_2:
47-
ENV_FILE: ci/deps/azure-windows-310.yaml
20+
py310:
21+
ENV_FILE: ci/deps/actions-310.yaml
4822
CONDA_PY: "310"
49-
PATTERN: "not slow and not high_memory"
50-
PYTEST_WORKERS: 2 # GH-42236
51-
PYTEST_TARGET: "pandas/tests/[i-z]*"
5223

5324
steps:
5425
- powershell: |
@@ -59,7 +30,7 @@ jobs:
5930
displayName: 'Update conda'
6031

6132
- bash: |
62-
conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
33+
conda env create -q --file ci\\deps\\actions-$(CONDA_PY).yaml
6334
displayName: 'Create anaconda environment'
6435
- bash: |
6536
source activate pandas-dev

ci/deps/azure-windows-310.yaml

-41
This file was deleted.

ci/deps/azure-windows-38.yaml

-35
This file was deleted.

ci/deps/azure-windows-39.yaml

-40
This file was deleted.

0 commit comments

Comments
 (0)