From 919e58e0270daad8fa7fc35eb83b38603f182de1 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 20 Jan 2022 09:55:27 -0800 Subject: [PATCH 1/4] CI/TST: Disable tests/window/moments for Azure timeouts --- ci/run_tests.sh | 4 ++-- pandas/tests/window/moments/conftest.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 203f8fe293a06..28d6b12127eb9 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -26,8 +26,8 @@ fi PYTEST_CMD="${XVFB}pytest -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/" +if [[ $(uname) != "Linux" ]]; then + PYTEST_CMD="$PYTEST_CMD --ignore=pandas/tests/window/moments --ignore=pandas/tests/plotting/" fi echo $PYTEST_CMD diff --git a/pandas/tests/window/moments/conftest.py b/pandas/tests/window/moments/conftest.py index 8f7c20fe03a02..45f9ad794d0b1 100644 --- a/pandas/tests/window/moments/conftest.py +++ b/pandas/tests/window/moments/conftest.py @@ -41,7 +41,6 @@ def is_constant(x): for obj in itertools.chain(create_series(), create_dataframes()) if is_constant(obj) ), - scope="module", ) def consistent_data(request): return request.param From 3c19ed2cac30af0971e45be29c940bbe0a09391b Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 20 Jan 2022 11:10:25 -0800 Subject: [PATCH 2/4] Bump windows timeout to 90 minutes? --- ci/azure/windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index 7061a266f28c7..e0b0ff02f349b 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -4,6 +4,7 @@ parameters: jobs: - job: ${{ parameters.name }} + timeoutInMinutes: 90 pool: vmImage: ${{ parameters.vmImage }} strategy: From 2ad98f60a3f9a514dd3315a55de346037834ab95 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 20 Jan 2022 13:50:50 -0800 Subject: [PATCH 3/4] Pin xdist? idk --- ci/deps/azure-windows-310.yaml | 2 +- ci/deps/azure-windows-38.yaml | 2 +- ci/deps/azure-windows-39.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/deps/azure-windows-310.yaml b/ci/deps/azure-windows-310.yaml index 8e6f4deef6057..28f8ebfb3b726 100644 --- a/ci/deps/azure-windows-310.yaml +++ b/ci/deps/azure-windows-310.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.24 - pytest>=6.0 - - pytest-xdist>=1.31 + - pytest-xdist=2.4.0 - hypothesis>=5.5.3 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-38.yaml b/ci/deps/azure-windows-38.yaml index eb533524147d9..85148c4c78cde 100644 --- a/ci/deps/azure-windows-38.yaml +++ b/ci/deps/azure-windows-38.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.24 - pytest>=6.0 - - pytest-xdist>=1.31 + - pytest-xdist=2.4.0 - hypothesis>=5.5.3 - pytest-azurepipelines diff --git a/ci/deps/azure-windows-39.yaml b/ci/deps/azure-windows-39.yaml index 6f820b1c2aedb..fdc6aaa048ce0 100644 --- a/ci/deps/azure-windows-39.yaml +++ b/ci/deps/azure-windows-39.yaml @@ -8,7 +8,7 @@ dependencies: # tools - cython>=0.29.24 - pytest>=6.0 - - pytest-xdist>=1.31 + - pytest-xdist=2.4.0 - hypothesis>=5.5.3 - pytest-azurepipelines From 84307af58209ff5d82103e27290df233cec5f7ac Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 20 Jan 2022 13:51:23 -0800 Subject: [PATCH 4/4] Remove timeout --- ci/azure/windows.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/azure/windows.yml b/ci/azure/windows.yml index e0b0ff02f349b..7061a266f28c7 100644 --- a/ci/azure/windows.yml +++ b/ci/azure/windows.yml @@ -4,7 +4,6 @@ parameters: jobs: - job: ${{ parameters.name }} - timeoutInMinutes: 90 pool: vmImage: ${{ parameters.vmImage }} strategy: