From bf02177482677961aac7663aeed8245a3c2ce6f6 Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Fri, 10 Sep 2021 08:39:28 -0400 Subject: [PATCH 1/3] Backport PR #43468: CI: split Windows Azure tests in half --- .github/workflows/ci.yml | 1 + .github/workflows/posix.yml | 1 + .github/workflows/python-dev.yml | 1 + azure-pipelines.yml | 1 + ci/azure/windows.yml | 35 ++++++++++++++++++++++++++++++-- ci/run_tests.sh | 2 +- 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d39a33e7a88c3..c10caaca0c186 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -165,6 +165,7 @@ jobs: PANDAS_DATA_MANAGER: array PATTERN: ${{ matrix.pattern }} PYTEST_WORKERS: "auto" + PYTEST_TARGET: pandas run: | source activate pandas-dev ci/run_tests.sh diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 36d410c3f5c4e..677675dcd2231 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -45,6 +45,7 @@ jobs: LC_ALL: ${{ matrix.settings[4] }} PANDAS_TESTING_MODE: ${{ matrix.settings[5] }} TEST_ARGS: ${{ matrix.settings[6] }} + PYTEST_TARGET: pandas steps: - name: Checkout diff --git a/.github/workflows/python-dev.yml b/.github/workflows/python-dev.yml index 94ab2b568b636..894328aee53e1 100644 --- a/.github/workflows/python-dev.yml +++ b/.github/workflows/python-dev.yml @@ -17,6 +17,7 @@ env: PANDAS_CI: 1 PATTERN: "not slow and not network and not clipboard" COVERAGE: true + PYTEST_TARGET: pandas jobs: build: diff --git a/azure-pipelines.yml b/azure-pipelines.yml index edc9c42fe805a..7bda80f4e6024 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,6 +17,7 @@ pr: variables: PYTEST_WORKERS: auto + PYTEST_TARGET: pandas jobs: # Mac and Linux use the same template diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 7c088622f9638..baa9c0c857c23 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -8,17 +8,47 @@ jobs: vmImage: ${{ parameters.vmImage }} strategy: matrix: - py37_np17: + py37_np17_1: ENV_FILE: ci/deps/azure-windows-37.yaml CONDA_PY: "37" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 + PYTEST_TARGET: "pandas/tests/[a-i]*" - py38_np18: + py37_np17_2: + ENV_FILE: ci/deps/azure-windows-37.yaml + CONDA_PY: "37" + PATTERN: "not slow and not network" + PYTEST_WORKERS: 2 # GH-42236 + PYTEST_TARGET: "pandas/tests/[j-z]*" + + py38_np18_1: + ENV_FILE: ci/deps/azure-windows-38.yaml + CONDA_PY: "38" + PATTERN: "not slow and not network" + PYTEST_WORKERS: 2 # GH-42236 + PYTEST_TARGET: "pandas/tests/[a-i]*" + + py38_np18_2: ENV_FILE: ci/deps/azure-windows-38.yaml CONDA_PY: "38" + PATTERN: "not slow and not network" + PYTEST_WORKERS: 2 # GH-42236 + PYTEST_TARGET: "pandas/tests/[j-z]*" + + py39_1: + ENV_FILE: ci/deps/azure-windows-39.yaml + CONDA_PY: "39" + PATTERN: "not slow and not network and not high_memory" + PYTEST_WORKERS: 2 # GH-42236 + PYTEST_TARGET: "pandas/tests/[a-i]*" + + py39_2: + ENV_FILE: ci/deps/azure-windows-39.yaml + CONDA_PY: "39" PATTERN: "not slow and not network and not high_memory" PYTEST_WORKERS: 2 # GH-42236 + PYTEST_TARGET: "pandas/tests/[j-z]*" steps: - powershell: | @@ -42,6 +72,7 @@ jobs: - bash: | source activate pandas-dev + wmic.exe cpu get caption, deviceid, name, numberofcores, maxclockspeed ci/run_tests.sh displayName: 'Test' diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 0d6f26d8c29f8..ed1c5dc873092 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -19,7 +19,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE pandas" +PYTEST_CMD="${XVFB}pytest -m \"$PATTERN\" -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ $(uname) != "Linux" && $(uname) != "Darwin" ]]; then # GH#37455 windows py38 build appears to be running out of memory From 6452e015078175db51922837b1c10a6cb158eecf Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Sun, 12 Sep 2021 10:52:05 -0400 Subject: [PATCH 2/3] split macos tests in 2 (#43517) --- ci/azure/posix.yml | 8 +++++++- ci/azure/windows.yml | 9 ++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 2caacf3a07290..12ba8dec0ac75 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -9,10 +9,16 @@ jobs: strategy: matrix: ${{ if eq(parameters.name, 'macOS') }}: - py37_macos: + py37_macos_1: ENV_FILE: ci/deps/azure-macos-37.yaml CONDA_PY: "37" PATTERN: "not slow and not network" + PYTEST_TARGET: "pandas/tests/[a-h]*" + py37_macos_2: + ENV_FILE: ci/deps/azure-macos-38.yaml + CONDA_PY: "37" + PATTERN: "not slow and not network" + PYTEST_TARGET: "pandas/tests/[i-z]*" steps: - script: echo '##vso[task.prependpath]$(HOME)/miniconda3/bin' diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index c0821b83cab88..95d1a723548a7 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -13,29 +13,28 @@ jobs: CONDA_PY: "37" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 - PYTEST_TARGET: "pandas/tests/[a-i]*" + PYTEST_TARGET: "pandas/tests/[a-h]*" py37_np17_2: ENV_FILE: ci/deps/azure-windows-37.yaml CONDA_PY: "37" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 - PYTEST_TARGET: "pandas/tests/[j-z]*" + PYTEST_TARGET: "pandas/tests/[i-z]*" py38_np18_1: ENV_FILE: ci/deps/azure-windows-38.yaml CONDA_PY: "38" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 - PYTEST_TARGET: "pandas/tests/[a-i]*" + PYTEST_TARGET: "pandas/tests/[a-h]*" py38_np18_2: ENV_FILE: ci/deps/azure-windows-38.yaml CONDA_PY: "38" PATTERN: "not slow and not network" PYTEST_WORKERS: 2 # GH-42236 - PYTEST_TARGET: "pandas/tests/[j-z]*" - + PYTEST_TARGET: "pandas/tests/[i-z]*" steps: - powershell: | From 08f578fcc83fc4f5b0415da923a73b8cf6d36651 Mon Sep 17 00:00:00 2001 From: Irv Lustig Date: Sun, 12 Sep 2021 14:54:51 -0400 Subject: [PATCH 3/3] fix macos backport to use 3.7 --- ci/azure/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/azure/posix.yml b/ci/azure/posix.yml index 12ba8dec0ac75..4d41500093a40 100644 --- a/ci/azure/posix.yml +++ b/ci/azure/posix.yml @@ -15,7 +15,7 @@ jobs: PATTERN: "not slow and not network" PYTEST_TARGET: "pandas/tests/[a-h]*" py37_macos_2: - ENV_FILE: ci/deps/azure-macos-38.yaml + ENV_FILE: ci/deps/azure-macos-37.yaml CONDA_PY: "37" PATTERN: "not slow and not network" PYTEST_TARGET: "pandas/tests/[i-z]*"