CI: Align Azure & GHA dependencies

azure-pipelines.yml

@@ -18,18 +18,19 @@ 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
 - template: ci/azure/posix.yml
   parameters:
     name: macOS
-    vmImage: macOS-10.15
+    vmImage: macOS-latest
 
 - template: ci/azure/windows.yml
   parameters:
     name: Windows
-    vmImage: windows-2019
+    vmImage: windows-latest
 
 - job: py38_32bit
   pool:

ci/azure/posix.yml

@@ -4,40 +4,22 @@ parameters:
 
 jobs:
 - job: ${{ parameters.name }}
+  timeoutInMinutes: 90
   pool:
     vmImage: ${{ parameters.vmImage }}
   strategy:
     matrix:
-      py38_macos_1:
-        ENV_FILE: ci/deps/azure-macos-38.yaml
+      py38:
+        ENV_FILE: ci/deps/actions-38.yaml
         CONDA_PY: "38"
-        PATTERN: "not slow"
-        PYTEST_TARGET: "pandas/tests/[a-h]*"
-      py38_macos_2:
-        ENV_FILE: ci/deps/azure-macos-38.yaml
-        CONDA_PY: "38"
-        PATTERN: "not slow"
-        PYTEST_TARGET: "pandas/tests/[i-z]*"
-      py39_macos_1:
-        ENV_FILE: ci/deps/azure-macos-39.yaml
-        CONDA_PY: "39"
-        PATTERN: "not slow"
-        PYTEST_TARGET: "pandas/tests/[a-h]*"
-      py39_macos_2:
-        ENV_FILE: ci/deps/azure-macos-39.yaml
+
+      py39:
+        ENV_FILE: ci/deps/actions-39.yaml
         CONDA_PY: "39"
-        PATTERN: "not slow"
-        PYTEST_TARGET: "pandas/tests/[i-z]*"
-      py310_macos_1:
-        ENV_FILE: ci/deps/azure-macos-310.yaml
-        CONDA_PY: "310"
-        PATTERN: "not slow"
-        PYTEST_TARGET: "pandas/tests/[a-h]*"
-      py310_macos_2:
-        ENV_FILE: ci/deps/azure-macos-310.yaml
+
+      py310:
+        ENV_FILE: ci/deps/actions-310.yaml
         CONDA_PY: "310"
-        PATTERN: "not slow"
-        PYTEST_TARGET: "pandas/tests/[i-z]*"
 
   steps:
     - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin'

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

ci/run_tests.sh

@@ -24,18 +24,14 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then
     XVFB="xvfb-run "
 fi
 
-PYTEST_CMD="${XVFB}pytest -r fEs -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
-
-if [[ $(uname) != "Linux"  && $(uname) != "Darwin" ]]; then
-    PYTEST_CMD="$PYTEST_CMD --ignore=pandas/tests/plotting/"
-fi
+PYTEST_CMD="${XVFB}pytest -v -r fEs -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET"
 
 echo $PYTEST_CMD
 sh -c "$PYTEST_CMD"
 
 if [[ "$PANDAS_DATA_MANAGER" != "array" ]]; then
     # The ArrayManager tests should have already been run by PYTEST_CMD if PANDAS_DATA_MANAGER was already set to array
-    PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -m \"$PATTERN and arraymanager\" -n $PYTEST_WORKERS  --dist=loadfile $TEST_ARGS $COVERAGE pandas"
+    PYTEST_AM_CMD="PANDAS_DATA_MANAGER=array pytest -v -m \"$PATTERN and arraymanager\" -n $PYTEST_WORKERS  --dist=loadfile $TEST_ARGS $COVERAGE pandas"
 
     echo $PYTEST_AM_CMD
     sh -c "$PYTEST_AM_CMD"