CI: Align GHA and Windows Azure dependencies (pandas-dev#45856)

adana315 · Feb 7, 2022 · 6a5cdf5 · 6a5cdf5
1 parent da1d6ba
commit 6a5cdf5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 153 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -18,6 +18,8 @@ pr:
 variables:
   PYTEST_WORKERS: auto
   PYTEST_TARGET:  pandas
+  PATTERN: "not slow and not high_memory and not db and not network"
+  PANDAS_CI: 1
 
 jobs:
 # Mac and Linux use the same template

diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml
@@ -4,51 +4,22 @@ parameters:
 
 jobs:
 - job: ${{ parameters.name }}
+  timeoutInMinutes: 90
   pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      py38_np18_1:
-        ENV_FILE: ci/deps/azure-windows-38.yaml
+      py38:
+        ENV_FILE: ci/deps/actions-38.yaml
         CONDA_PY: "38"
-        PATTERN: "not slow"
-        PYTEST_WORKERS: 2  # GH-42236
-        PYTEST_TARGET: "pandas/tests/[a-h]*"
 
-      py38_np18_2:
-        ENV_FILE: ci/deps/azure-windows-38.yaml
-        CONDA_PY: "38"
-        PATTERN: "not slow"
-        PYTEST_WORKERS: 2  # GH-42236
-        PYTEST_TARGET: "pandas/tests/[i-z]*"
-
-      py39_1:
-        ENV_FILE: ci/deps/azure-windows-39.yaml
-        CONDA_PY: "39"
-        PATTERN: "not slow and not high_memory"
-        PYTEST_WORKERS: 2  # GH-42236
-        PYTEST_TARGET: "pandas/tests/[a-h]*"
-
-      py39_2:
-        ENV_FILE: ci/deps/azure-windows-39.yaml
+      py39:
+        ENV_FILE: ci/deps/actions-39.yaml
         CONDA_PY: "39"
-        PATTERN: "not slow and not high_memory"
-        PYTEST_WORKERS: 2  # GH-42236
-        PYTEST_TARGET: "pandas/tests/[i-z]*"
-
-      py310_1:
-        ENV_FILE: ci/deps/azure-windows-310.yaml
-        CONDA_PY: "310"
-        PATTERN: "not slow and not high_memory"
-        PYTEST_WORKERS: 2  # GH-42236
-        PYTEST_TARGET: "pandas/tests/[a-h]*"
 
-      py310_2:
-        ENV_FILE: ci/deps/azure-windows-310.yaml
+      py310:
+        ENV_FILE: ci/deps/actions-310.yaml
         CONDA_PY: "310"
-        PATTERN: "not slow and not high_memory"
-        PYTEST_WORKERS: 2  # GH-42236
-        PYTEST_TARGET: "pandas/tests/[i-z]*"
 
   steps:
     - powershell: |
@@ -59,7 +30,7 @@ jobs:
       displayName: 'Update conda'
 
     - bash: |
-        conda env create -q --file ci\\deps\\azure-windows-$(CONDA_PY).yaml
+        conda env create -q --file ci\\deps\\actions-$(CONDA_PY).yaml
       displayName: 'Create anaconda environment'
     - bash: |
         source activate pandas-dev

diff --git a/ci/deps/azure-windows-310.yaml b/ci/deps/azure-windows-310.yaml
diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml
diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml