From 3890ea8c8c838b4f96b5503d375886c8330a9ec0 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 12 Jun 2022 11:00:54 -0700 Subject: [PATCH 01/26] CI/DEBUG: Windows 3.9 memory error --- ci/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_tests.sh b/ci/run_tests.sh index e6de5caf955fc..5bff8bb412947 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From 522d7ac25873ab95559b3de65f9c785e5845c5a4 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 12 Jun 2022 18:54:14 -0700 Subject: [PATCH 02/26] Try skipping some suspicious tests --- pandas/tests/plotting/frame/test_frame.py | 8 ++++++++ pandas/tests/window/test_win_type.py | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/pandas/tests/plotting/frame/test_frame.py b/pandas/tests/plotting/frame/test_frame.py index 3ec3744e43653..48426095f7f0c 100644 --- a/pandas/tests/plotting/frame/test_frame.py +++ b/pandas/tests/plotting/frame/test_frame.py @@ -10,6 +10,10 @@ import numpy as np import pytest +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) import pandas.util._test_decorators as td from pandas.core.dtypes.api import is_list_like @@ -139,6 +143,10 @@ def test_plot(self): result = ax.axes assert result is axes[0] + @pytest.mark.skipif( + is_ci_environment() and is_platform_windows(), + reason="Causes MemoryError on Windows", + ) def test_nullable_int_plot(self): # GH 32073 dates = ["2008", "2009", None, "2011", "2012"] diff --git a/pandas/tests/window/test_win_type.py b/pandas/tests/window/test_win_type.py index 8c8e9cadbfdc1..fda6282188e4a 100644 --- a/pandas/tests/window/test_win_type.py +++ b/pandas/tests/window/test_win_type.py @@ -1,6 +1,10 @@ import numpy as np import pytest +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) from pandas.errors import UnsupportedFunctionCall import pandas.util._test_decorators as td @@ -679,6 +683,10 @@ def test_cmov_window_special_linear_range(win_types_special, step): @td.skip_if_no_scipy +@pytest.mark.skipif( + is_ci_environment() and is_platform_windows(), + reason="Causes MemoryError on Windows", +) def test_weighted_var_big_window_no_segfault(win_types, center): # Github Issue #46772 x = Series(0) From 52317b462950f5b187cd3696d1420e76e4e8a176 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 12 Jun 2022 21:53:44 -0700 Subject: [PATCH 03/26] Try skipping this hanging test --- pandas/tests/window/test_cython_aggregations.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pandas/tests/window/test_cython_aggregations.py b/pandas/tests/window/test_cython_aggregations.py index c60cb6ea74ec0..2db7261dd15ea 100644 --- a/pandas/tests/window/test_cython_aggregations.py +++ b/pandas/tests/window/test_cython_aggregations.py @@ -5,6 +5,10 @@ import pytest import pandas._libs.window.aggregations as window_aggregations +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) from pandas import Series import pandas._testing as tm @@ -86,6 +90,10 @@ def test_rolling_aggregation_boundary_consistency(rolling_aggregation): tm.assert_equal(expected, result) +@pytest.mark.skipif( + is_ci_environment() and is_platform_windows(), + reason="Causes MemoryError on Windows", +) def test_rolling_aggregation_with_unused_elements(rolling_aggregation): # GH-45647 minp, width = 0, 5 # width at least 4 for kurt From ae969e8acb726f23668379116a6e0392151b1029 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Mon, 13 Jun 2022 14:50:00 -0700 Subject: [PATCH 04/26] Check if can run okay on single process --- .github/workflows/macos-windows.yml | 2 +- ci/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 26e6c8699ca64..b08aa50d9a3b7 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -24,7 +24,7 @@ jobs: defaults: run: shell: bash -el {0} - timeout-minutes: 90 + timeout-minutes: 360 strategy: matrix: os: [macos-latest, windows-latest] diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 5bff8bb412947..e2a423ee569bf 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -r fEs $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From ab9adc73bb12e968655a06725dd2047766c82e4e Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 14 Jun 2022 13:50:32 -0700 Subject: [PATCH 05/26] Trigger CI From aac2b398d153af3ea8246e5d7dd4cb659bc40a82 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 15 Jun 2022 13:04:53 -0700 Subject: [PATCH 06/26] run in parallel again --- .github/workflows/macos-windows.yml | 2 +- ci/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 7c98e20c2d05f..4c48d83b68947 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -24,7 +24,7 @@ jobs: defaults: run: shell: bash -el {0} - timeout-minutes: 360 + timeout-minutes: 90 strategy: matrix: os: [macos-latest, windows-latest] diff --git a/ci/run_tests.sh b/ci/run_tests.sh index e2a423ee569bf..5bff8bb412947 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -r fEs $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From 4d85ce1896408938ccd0c26824995726c074f2af Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 15 Jun 2022 15:58:21 -0700 Subject: [PATCH 07/26] Log even more --- .github/workflows/macos-windows.yml | 8 ++++++++ ci/run_tests.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 4c48d83b68947..6d0a4082ed732 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -17,6 +17,7 @@ env: PYTEST_TARGET: pandas PYTEST_WORKERS: auto PATTERN: "not slow and not db and not network and not single_cpu" + PYTEST_DEBUG: true jobs: @@ -54,3 +55,10 @@ jobs: - name: Test uses: ./.github/actions/run-tests + + - name: Save debug log as an artifact + uses: actions/upload-artifact@v3 + with: + name: pytest_debug_log + path: pytestdebug.log + retention-days: 14 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 5bff8bb412947..d03f7904015e9 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -r fEs --full-trace --log-level=DEBUG --debug -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From 6f8fc5bc4700fc3b0378295c484e041a7beee1a0 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 15 Jun 2022 17:50:38 -0700 Subject: [PATCH 08/26] a little less debugging --- .github/workflows/macos-windows.yml | 2 +- ci/run_tests.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 6d0a4082ed732..91b109441b887 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -17,7 +17,7 @@ env: PYTEST_TARGET: pandas PYTEST_WORKERS: auto PATTERN: "not slow and not db and not network and not single_cpu" - PYTEST_DEBUG: true + #PYTEST_DEBUG: true jobs: diff --git a/ci/run_tests.sh b/ci/run_tests.sh index d03f7904015e9..261f6272cd301 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -r fEs --full-trace --log-level=DEBUG --debug -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -r fEs --full-trace --setup-show -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From 78f176373468cdc7c03fabf9821b9d4d7267f32c Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Wed, 15 Jun 2022 21:32:11 -0700 Subject: [PATCH 09/26] dont try new pyarrow --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index d17d29ef38e7f..e21c1d1ade50d 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -40,7 +40,7 @@ dependencies: - psycopg2 - pymysql - pytables - - pyarrow + - pyarrow<8 - pyreadstat - python-snappy - pyxlsb diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 3cce3bda3915c..4c3444f335f18 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -38,7 +38,7 @@ dependencies: - pandas-gbq - psycopg2 - pymysql - - pyarrow + - pyarrow<8 - pyreadstat - pytables - python-snappy From 500c252f502400b483fd0e15b91926c4c157c116 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 16 Jun 2022 13:21:23 -0700 Subject: [PATCH 10/26] Try one more time with pyarrow<8, simple --- .github/workflows/macos-windows.yml | 12 ++++++------ ci/run_tests.sh | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 91b109441b887..e2bd8f6434874 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -56,9 +56,9 @@ jobs: - name: Test uses: ./.github/actions/run-tests - - name: Save debug log as an artifact - uses: actions/upload-artifact@v3 - with: - name: pytest_debug_log - path: pytestdebug.log - retention-days: 14 +# - name: Save debug log as an artifact +# uses: actions/upload-artifact@v3 +# with: +# name: pytest_debug_log +# path: pytestdebug.log +# retention-days: 14 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 261f6272cd301..5bff8bb412947 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -r fEs --full-trace --setup-show -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From 368371d620dc1ce135f6a48618c926a489e11a0b Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 16 Jun 2022 13:26:47 -0700 Subject: [PATCH 11/26] Comment out pyarrow hack --- .github/actions/setup-conda/action.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-conda/action.yml b/.github/actions/setup-conda/action.yml index 87a0bd2ed1715..71f1a14e8d07b 100644 --- a/.github/actions/setup-conda/action.yml +++ b/.github/actions/setup-conda/action.yml @@ -15,13 +15,13 @@ inputs: runs: using: composite steps: - - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} - run: | - grep -q ' - pyarrow' ${{ inputs.environment-file }} - sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} - cat ${{ inputs.environment-file }} - shell: bash - if: ${{ inputs.pyarrow-version }} +# - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} +# run: | +# grep -q ' - pyarrow' ${{ inputs.environment-file }} +# sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} +# cat ${{ inputs.environment-file }} +# shell: bash +# if: ${{ inputs.pyarrow-version }} - name: Install ${{ inputs.environment-file }} uses: conda-incubator/setup-miniconda@v2.1.1 From 33fad64c3266a7ff945bd86cbeb360cc0ad8e6e6 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 16 Jun 2022 15:02:42 -0700 Subject: [PATCH 12/26] Restart, show setup and full traceback --- .github/actions/setup-conda/action.yml | 14 +++++++------- .github/workflows/32-bit-linux.yml | 1 + .github/workflows/code-checks.yml | 4 ++++ .github/workflows/docbuild-and-upload.yml | 1 + .github/workflows/macos-windows.yml | 8 -------- .github/workflows/posix.yml | 1 + ci/deps/actions-310.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/run_tests.sh | 2 +- pandas/tests/plotting/frame/test_frame.py | 8 -------- pandas/tests/window/test_cython_aggregations.py | 8 -------- pandas/tests/window/test_win_type.py | 8 -------- 12 files changed, 17 insertions(+), 42 deletions(-) diff --git a/.github/actions/setup-conda/action.yml b/.github/actions/setup-conda/action.yml index 71f1a14e8d07b..87a0bd2ed1715 100644 --- a/.github/actions/setup-conda/action.yml +++ b/.github/actions/setup-conda/action.yml @@ -15,13 +15,13 @@ inputs: runs: using: composite steps: -# - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} -# run: | -# grep -q ' - pyarrow' ${{ inputs.environment-file }} -# sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} -# cat ${{ inputs.environment-file }} -# shell: bash -# if: ${{ inputs.pyarrow-version }} + - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} + run: | + grep -q ' - pyarrow' ${{ inputs.environment-file }} + sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} + cat ${{ inputs.environment-file }} + shell: bash + if: ${{ inputs.pyarrow-version }} - name: Install ${{ inputs.environment-file }} uses: conda-incubator/setup-miniconda@v2.1.1 diff --git a/.github/workflows/32-bit-linux.yml b/.github/workflows/32-bit-linux.yml index be894e6a5a63e..3f50a19860429 100644 --- a/.github/workflows/32-bit-linux.yml +++ b/.github/workflows/32-bit-linux.yml @@ -14,6 +14,7 @@ on: jobs: pytest: + if: false runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index 96088547634c5..ecbbf8be69340 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -16,6 +16,7 @@ env: jobs: pre_commit: + if: false name: pre-commit runs-on: ubuntu-latest concurrency: @@ -35,6 +36,7 @@ jobs: uses: pre-commit/action@v2.0.3 typing_and_docstring_validation: + if: false name: Docstring and typing validation runs-on: ubuntu-latest defaults: @@ -98,6 +100,7 @@ jobs: if: ${{ steps.build.outcome == 'success' }} asv-benchmarks: + if: false name: ASV Benchmarks runs-on: ubuntu-latest defaults: @@ -135,6 +138,7 @@ jobs: asv run --quick --dry-run --strict --durations=30 --python=same build_docker_dev_environment: + if: false name: Build Docker Dev Environment runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml index 5ffd4135802bd..cc01ca43f289c 100644 --- a/.github/workflows/docbuild-and-upload.yml +++ b/.github/workflows/docbuild-and-upload.yml @@ -16,6 +16,7 @@ env: jobs: web_and_docs: + if: false name: Doc Build and Upload runs-on: ubuntu-latest diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index e2bd8f6434874..4c48d83b68947 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -17,7 +17,6 @@ env: PYTEST_TARGET: pandas PYTEST_WORKERS: auto PATTERN: "not slow and not db and not network and not single_cpu" - #PYTEST_DEBUG: true jobs: @@ -55,10 +54,3 @@ jobs: - name: Test uses: ./.github/actions/run-tests - -# - name: Save debug log as an artifact -# uses: actions/upload-artifact@v3 -# with: -# name: pytest_debug_log -# path: pytestdebug.log -# retention-days: 14 diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 831bbd8bb3233..bf15f554eb239 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -17,6 +17,7 @@ env: jobs: pytest: + if: false runs-on: ubuntu-latest defaults: run: diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index e21c1d1ade50d..d17d29ef38e7f 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -40,7 +40,7 @@ dependencies: - psycopg2 - pymysql - pytables - - pyarrow<8 + - pyarrow - pyreadstat - python-snappy - pyxlsb diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 4c3444f335f18..3cce3bda3915c 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -38,7 +38,7 @@ dependencies: - pandas-gbq - psycopg2 - pymysql - - pyarrow<8 + - pyarrow - pyreadstat - pytables - python-snappy diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 5bff8bb412947..b7064763279ed 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v --full-trace --setup-show -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" diff --git a/pandas/tests/plotting/frame/test_frame.py b/pandas/tests/plotting/frame/test_frame.py index 48426095f7f0c..3ec3744e43653 100644 --- a/pandas/tests/plotting/frame/test_frame.py +++ b/pandas/tests/plotting/frame/test_frame.py @@ -10,10 +10,6 @@ import numpy as np import pytest -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) import pandas.util._test_decorators as td from pandas.core.dtypes.api import is_list_like @@ -143,10 +139,6 @@ def test_plot(self): result = ax.axes assert result is axes[0] - @pytest.mark.skipif( - is_ci_environment() and is_platform_windows(), - reason="Causes MemoryError on Windows", - ) def test_nullable_int_plot(self): # GH 32073 dates = ["2008", "2009", None, "2011", "2012"] diff --git a/pandas/tests/window/test_cython_aggregations.py b/pandas/tests/window/test_cython_aggregations.py index 2db7261dd15ea..c60cb6ea74ec0 100644 --- a/pandas/tests/window/test_cython_aggregations.py +++ b/pandas/tests/window/test_cython_aggregations.py @@ -5,10 +5,6 @@ import pytest import pandas._libs.window.aggregations as window_aggregations -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) from pandas import Series import pandas._testing as tm @@ -90,10 +86,6 @@ def test_rolling_aggregation_boundary_consistency(rolling_aggregation): tm.assert_equal(expected, result) -@pytest.mark.skipif( - is_ci_environment() and is_platform_windows(), - reason="Causes MemoryError on Windows", -) def test_rolling_aggregation_with_unused_elements(rolling_aggregation): # GH-45647 minp, width = 0, 5 # width at least 4 for kurt diff --git a/pandas/tests/window/test_win_type.py b/pandas/tests/window/test_win_type.py index fda6282188e4a..8c8e9cadbfdc1 100644 --- a/pandas/tests/window/test_win_type.py +++ b/pandas/tests/window/test_win_type.py @@ -1,10 +1,6 @@ import numpy as np import pytest -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) from pandas.errors import UnsupportedFunctionCall import pandas.util._test_decorators as td @@ -683,10 +679,6 @@ def test_cmov_window_special_linear_range(win_types_special, step): @td.skip_if_no_scipy -@pytest.mark.skipif( - is_ci_environment() and is_platform_windows(), - reason="Causes MemoryError on Windows", -) def test_weighted_var_big_window_no_segfault(win_types, center): # Github Issue #46772 x = Series(0) From 9dc7d6946c771af4856b3df742dd256d7ded8048 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Thu, 16 Jun 2022 15:03:48 -0700 Subject: [PATCH 13/26] Also try the older windows --- .github/workflows/macos-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 4c48d83b68947..6dbcd1e36b322 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -27,7 +27,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - os: [macos-latest, windows-latest] + os: [macos-latest, windows-2019] env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] fail-fast: false runs-on: ${{ matrix.os }} From 15034a3e309b07442deb655ed68bd7aa6809da75 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 17 Jun 2022 10:39:07 -0700 Subject: [PATCH 14/26] generate debug log again --- .github/workflows/macos-windows.yml | 8 ++++++++ ci/run_tests.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 6dbcd1e36b322..714f587684b06 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -17,6 +17,7 @@ env: PYTEST_TARGET: pandas PYTEST_WORKERS: auto PATTERN: "not slow and not db and not network and not single_cpu" + PYTEST_DEBUG: true jobs: @@ -54,3 +55,10 @@ jobs: - name: Test uses: ./.github/actions/run-tests + + - name: Save debug log as an artifact + uses: actions/upload-artifact@v3 + with: + name: pytest_debug_log + path: pytestdebug.log + retention-days: 14 diff --git a/ci/run_tests.sh b/ci/run_tests.sh index b7064763279ed..024f31dad6210 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v --full-trace --setup-show -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v --full-trace --setup-show --log-level=DEBUG --debug -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From a4480bae5b6bb696204316c546001291950d4d30 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 17 Jun 2022 10:44:54 -0700 Subject: [PATCH 15/26] change to latest --- .github/workflows/macos-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 714f587684b06..6d0a4082ed732 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -28,7 +28,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - os: [macos-latest, windows-2019] + os: [macos-latest, windows-latest] env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] fail-fast: false runs-on: ${{ matrix.os }} From 35612b7b02d7310084237477c4bae33e37381de1 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 17 Jun 2022 13:20:46 -0700 Subject: [PATCH 16/26] dump log if failure --- .github/workflows/macos-windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 6d0a4082ed732..6e15eee8d7f41 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -62,3 +62,4 @@ jobs: name: pytest_debug_log path: pytestdebug.log retention-days: 14 + if: failure() From 6dd81e81fc8265f46a6102cbd9870850935bb007 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 17 Jun 2022 15:50:24 -0700 Subject: [PATCH 17/26] Create separate log per os/version --- .github/workflows/macos-windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 6e15eee8d7f41..8dacf3bfe9baf 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -59,7 +59,7 @@ jobs: - name: Save debug log as an artifact uses: actions/upload-artifact@v3 with: - name: pytest_debug_log + name: pytest_debug_log_${{ matrix.env_file }}_${{ matrix.os }} path: pytestdebug.log retention-days: 14 if: failure() From 4d893544d18686075ffb01295be6a441542f326d Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 17 Jun 2022 17:26:48 -0700 Subject: [PATCH 18/26] See if it was any dependencies bumped recently --- .github/actions/setup-conda/action.yml | 14 +++++++------- .github/workflows/macos-windows.yml | 11 +---------- ci/deps/actions-38.yaml | 6 +++--- ci/deps/actions-39.yaml | 6 +++--- ci/run_tests.sh | 2 +- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.github/actions/setup-conda/action.yml b/.github/actions/setup-conda/action.yml index 87a0bd2ed1715..71f1a14e8d07b 100644 --- a/.github/actions/setup-conda/action.yml +++ b/.github/actions/setup-conda/action.yml @@ -15,13 +15,13 @@ inputs: runs: using: composite steps: - - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} - run: | - grep -q ' - pyarrow' ${{ inputs.environment-file }} - sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} - cat ${{ inputs.environment-file }} - shell: bash - if: ${{ inputs.pyarrow-version }} +# - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} +# run: | +# grep -q ' - pyarrow' ${{ inputs.environment-file }} +# sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} +# cat ${{ inputs.environment-file }} +# shell: bash +# if: ${{ inputs.pyarrow-version }} - name: Install ${{ inputs.environment-file }} uses: conda-incubator/setup-miniconda@v2.1.1 diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 8dacf3bfe9baf..b1ea3379228ce 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -17,7 +17,6 @@ env: PYTEST_TARGET: pandas PYTEST_WORKERS: auto PATTERN: "not slow and not db and not network and not single_cpu" - PYTEST_DEBUG: true jobs: @@ -28,7 +27,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - os: [macos-latest, windows-latest] + os: [windows-latest] env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] fail-fast: false runs-on: ${{ matrix.os }} @@ -55,11 +54,3 @@ jobs: - name: Test uses: ./.github/actions/run-tests - - - name: Save debug log as an artifact - uses: actions/upload-artifact@v3 - with: - name: pytest_debug_log_${{ matrix.env_file }}_${{ matrix.os }} - path: pytestdebug.log - retention-days: 14 - if: failure() diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 71b03c2a81939..37247964cc198 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist>=1.31 - psutil - pytest-asyncio>=0.17 - - boto3 + - boto3<1.24.3 # required dependencies - python-dateutil @@ -35,9 +35,9 @@ dependencies: - numexpr - openpyxl - odfpy - - pandas-gbq + - pandas-gbq<0.17.5 - psycopg2 - - pyarrow + - pyarrow<8 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 3cce3bda3915c..0eef001ce570f 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist>=1.31 - psutil - pytest-asyncio>=0.17 - - boto3 + - boto3<1.24.3 # required dependencies - python-dateutil @@ -35,10 +35,10 @@ dependencies: - numexpr - openpyxl - odfpy - - pandas-gbq + - pandas-gbq<0.17.5 - psycopg2 - pymysql - - pyarrow + - pyarrow<8 - pyreadstat - pytables - python-snappy diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 024f31dad6210..969d773d360a8 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v --full-trace --setup-show --log-level=DEBUG --debug -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -v --full-trace -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\"" From f6ec16284ce56e751911efd577bb928964de007c Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sat, 18 Jun 2022 20:43:20 -0700 Subject: [PATCH 19/26] See if same errors happen without dependencies pinnning --- ci/deps/actions-38.yaml | 6 +++--- ci/deps/actions-39.yaml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 37247964cc198..71b03c2a81939 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist>=1.31 - psutil - pytest-asyncio>=0.17 - - boto3<1.24.3 + - boto3 # required dependencies - python-dateutil @@ -35,9 +35,9 @@ dependencies: - numexpr - openpyxl - odfpy - - pandas-gbq<0.17.5 + - pandas-gbq - psycopg2 - - pyarrow<8 + - pyarrow - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 0eef001ce570f..3cce3bda3915c 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -11,7 +11,7 @@ dependencies: - pytest-xdist>=1.31 - psutil - pytest-asyncio>=0.17 - - boto3<1.24.3 + - boto3 # required dependencies - python-dateutil @@ -35,10 +35,10 @@ dependencies: - numexpr - openpyxl - odfpy - - pandas-gbq<0.17.5 + - pandas-gbq - psycopg2 - pymysql - - pyarrow<8 + - pyarrow - pyreadstat - pytables - python-snappy From c632db43f2cddb341cbc342d788e9f3ae3defc42 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sat, 18 Jun 2022 21:44:35 -0700 Subject: [PATCH 20/26] Skip plotting tests on windows --- pandas/tests/plotting/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pandas/tests/plotting/__init__.py b/pandas/tests/plotting/__init__.py index e69de29bb2d1d..24979287a8d32 100644 --- a/pandas/tests/plotting/__init__.py +++ b/pandas/tests/plotting/__init__.py @@ -0,0 +1,10 @@ +import pytest + +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) + +pytestmark = pytest.mark.skipif( + is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" +) From 0aca385818327e0a77b6985942347b57dea1282a Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sat, 18 Jun 2022 22:39:07 -0700 Subject: [PATCH 21/26] Skip in frame as well --- pandas/tests/plotting/frame/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pandas/tests/plotting/frame/__init__.py b/pandas/tests/plotting/frame/__init__.py index e69de29bb2d1d..24979287a8d32 100644 --- a/pandas/tests/plotting/frame/__init__.py +++ b/pandas/tests/plotting/frame/__init__.py @@ -0,0 +1,10 @@ +import pytest + +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) + +pytestmark = pytest.mark.skipif( + is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" +) From 99fca718536abb7bc5e2b4bf266afa7ee54eacc0 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sat, 18 Jun 2022 23:36:44 -0700 Subject: [PATCH 22/26] Trigger another run From 4d621e379c645421e3b7cd6d6690133634db2a61 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 19 Jun 2022 11:19:58 -0700 Subject: [PATCH 23/26] Is it the non-nano? --- pandas/tests/scalar/timedelta/test_timedelta.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pandas/tests/scalar/timedelta/test_timedelta.py b/pandas/tests/scalar/timedelta/test_timedelta.py index 99b3bbf0186bb..e46bb9e95755b 100644 --- a/pandas/tests/scalar/timedelta/test_timedelta.py +++ b/pandas/tests/scalar/timedelta/test_timedelta.py @@ -14,6 +14,10 @@ iNaT, ) from pandas._libs.tslibs.dtypes import NpyDatetimeUnit +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) from pandas.errors import OutOfBoundsTimedelta import pandas as pd @@ -26,6 +30,9 @@ import pandas._testing as tm +@pytest.mark.skipif( + is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" +) class TestAsUnit: def test_as_unit(self): td = Timedelta(days=1) @@ -100,6 +107,9 @@ def test_as_unit_non_nano(self): assert res.total_seconds() == 86400 +@pytest.mark.skipif( + is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" +) class TestNonNano: @pytest.fixture(params=[7, 8, 9]) def unit(self, request): From 33679474113a366542262f7e02fe9baa2023dbc4 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Sun, 19 Jun 2022 13:18:28 -0700 Subject: [PATCH 24/26] skip resample tests --- pandas/tests/resample/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pandas/tests/resample/__init__.py b/pandas/tests/resample/__init__.py index e69de29bb2d1d..24979287a8d32 100644 --- a/pandas/tests/resample/__init__.py +++ b/pandas/tests/resample/__init__.py @@ -0,0 +1,10 @@ +import pytest + +from pandas.compat import ( + is_ci_environment, + is_platform_windows, +) + +pytestmark = pytest.mark.skipif( + is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" +) From 14ca6a4393cff2401b3336c821e1f494c44f7ef7 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Mon, 20 Jun 2022 22:14:59 -0700 Subject: [PATCH 25/26] Just use 1 thread for windows --- .github/actions/setup-conda/action.yml | 14 +++++++------- .github/workflows/macos-windows.yml | 3 ++- pandas/tests/plotting/__init__.py | 10 ---------- pandas/tests/plotting/frame/__init__.py | 10 ---------- pandas/tests/resample/__init__.py | 10 ---------- pandas/tests/scalar/timedelta/test_timedelta.py | 10 ---------- 6 files changed, 9 insertions(+), 48 deletions(-) diff --git a/.github/actions/setup-conda/action.yml b/.github/actions/setup-conda/action.yml index 71f1a14e8d07b..87a0bd2ed1715 100644 --- a/.github/actions/setup-conda/action.yml +++ b/.github/actions/setup-conda/action.yml @@ -15,13 +15,13 @@ inputs: runs: using: composite steps: -# - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} -# run: | -# grep -q ' - pyarrow' ${{ inputs.environment-file }} -# sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} -# cat ${{ inputs.environment-file }} -# shell: bash -# if: ${{ inputs.pyarrow-version }} + - name: Set Arrow version in ${{ inputs.environment-file }} to ${{ inputs.pyarrow-version }} + run: | + grep -q ' - pyarrow' ${{ inputs.environment-file }} + sed -i"" -e "s/ - pyarrow/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} + cat ${{ inputs.environment-file }} + shell: bash + if: ${{ inputs.pyarrow-version }} - name: Install ${{ inputs.environment-file }} uses: conda-incubator/setup-miniconda@v2.1.1 diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index b1ea3379228ce..3d88ec4432de0 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -15,7 +15,6 @@ on: env: PANDAS_CI: 1 PYTEST_TARGET: pandas - PYTEST_WORKERS: auto PATTERN: "not slow and not db and not network and not single_cpu" @@ -36,6 +35,8 @@ jobs: # https://github.community/t/concurrecy-not-work-for-push/183068/7 group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.os }} cancel-in-progress: true + env: + PYTEST_WORKERS: ${{ matrix.os == 'macos-latest' && 'auto' || '1' }} steps: - name: Checkout diff --git a/pandas/tests/plotting/__init__.py b/pandas/tests/plotting/__init__.py index 24979287a8d32..e69de29bb2d1d 100644 --- a/pandas/tests/plotting/__init__.py +++ b/pandas/tests/plotting/__init__.py @@ -1,10 +0,0 @@ -import pytest - -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) - -pytestmark = pytest.mark.skipif( - is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" -) diff --git a/pandas/tests/plotting/frame/__init__.py b/pandas/tests/plotting/frame/__init__.py index 24979287a8d32..e69de29bb2d1d 100644 --- a/pandas/tests/plotting/frame/__init__.py +++ b/pandas/tests/plotting/frame/__init__.py @@ -1,10 +0,0 @@ -import pytest - -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) - -pytestmark = pytest.mark.skipif( - is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" -) diff --git a/pandas/tests/resample/__init__.py b/pandas/tests/resample/__init__.py index 24979287a8d32..e69de29bb2d1d 100644 --- a/pandas/tests/resample/__init__.py +++ b/pandas/tests/resample/__init__.py @@ -1,10 +0,0 @@ -import pytest - -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) - -pytestmark = pytest.mark.skipif( - is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" -) diff --git a/pandas/tests/scalar/timedelta/test_timedelta.py b/pandas/tests/scalar/timedelta/test_timedelta.py index e46bb9e95755b..99b3bbf0186bb 100644 --- a/pandas/tests/scalar/timedelta/test_timedelta.py +++ b/pandas/tests/scalar/timedelta/test_timedelta.py @@ -14,10 +14,6 @@ iNaT, ) from pandas._libs.tslibs.dtypes import NpyDatetimeUnit -from pandas.compat import ( - is_ci_environment, - is_platform_windows, -) from pandas.errors import OutOfBoundsTimedelta import pandas as pd @@ -30,9 +26,6 @@ import pandas._testing as tm -@pytest.mark.skipif( - is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" -) class TestAsUnit: def test_as_unit(self): td = Timedelta(days=1) @@ -107,9 +100,6 @@ def test_as_unit_non_nano(self): assert res.total_seconds() == 86400 -@pytest.mark.skipif( - is_platform_windows() and is_ci_environment(), reason="Causes pytest INTERNALERROR" -) class TestNonNano: @pytest.fixture(params=[7, 8, 9]) def unit(self, request): From 55dc2c2ee5fdfa7e7add5e69610912d07a2d48b5 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Tue, 21 Jun 2022 00:25:45 -0700 Subject: [PATCH 26/26] Full run --- .github/workflows/32-bit-linux.yml | 1 - .github/workflows/code-checks.yml | 4 ---- .github/workflows/docbuild-and-upload.yml | 1 - .github/workflows/macos-windows.yml | 3 ++- .github/workflows/posix.yml | 1 - ci/run_tests.sh | 2 +- 6 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/32-bit-linux.yml b/.github/workflows/32-bit-linux.yml index 3f50a19860429..be894e6a5a63e 100644 --- a/.github/workflows/32-bit-linux.yml +++ b/.github/workflows/32-bit-linux.yml @@ -14,7 +14,6 @@ on: jobs: pytest: - if: false runs-on: ubuntu-latest steps: - name: Checkout diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml index ecbbf8be69340..96088547634c5 100644 --- a/.github/workflows/code-checks.yml +++ b/.github/workflows/code-checks.yml @@ -16,7 +16,6 @@ env: jobs: pre_commit: - if: false name: pre-commit runs-on: ubuntu-latest concurrency: @@ -36,7 +35,6 @@ jobs: uses: pre-commit/action@v2.0.3 typing_and_docstring_validation: - if: false name: Docstring and typing validation runs-on: ubuntu-latest defaults: @@ -100,7 +98,6 @@ jobs: if: ${{ steps.build.outcome == 'success' }} asv-benchmarks: - if: false name: ASV Benchmarks runs-on: ubuntu-latest defaults: @@ -138,7 +135,6 @@ jobs: asv run --quick --dry-run --strict --durations=30 --python=same build_docker_dev_environment: - if: false name: Build Docker Dev Environment runs-on: ubuntu-latest defaults: diff --git a/.github/workflows/docbuild-and-upload.yml b/.github/workflows/docbuild-and-upload.yml index cc01ca43f289c..5ffd4135802bd 100644 --- a/.github/workflows/docbuild-and-upload.yml +++ b/.github/workflows/docbuild-and-upload.yml @@ -16,7 +16,6 @@ env: jobs: web_and_docs: - if: false name: Doc Build and Upload runs-on: ubuntu-latest diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index 3d88ec4432de0..7052b770e2586 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -26,7 +26,7 @@ jobs: timeout-minutes: 90 strategy: matrix: - os: [windows-latest] + os: [macos-latest, windows-latest] env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] fail-fast: false runs-on: ${{ matrix.os }} @@ -36,6 +36,7 @@ jobs: group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.os }} cancel-in-progress: true env: + # GH 47443: PYTEST_WORKERS > 1 crashes Windows builds with memory related errors PYTEST_WORKERS: ${{ matrix.os == 'macos-latest' && 'auto' || '1' }} steps: diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index bf15f554eb239..831bbd8bb3233 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -17,7 +17,6 @@ env: jobs: pytest: - if: false runs-on: ubuntu-latest defaults: run: diff --git a/ci/run_tests.sh b/ci/run_tests.sh index 969d773d360a8..e6de5caf955fc 100755 --- a/ci/run_tests.sh +++ b/ci/run_tests.sh @@ -24,7 +24,7 @@ if [[ $(uname) == "Linux" && -z $DISPLAY ]]; then XVFB="xvfb-run " fi -PYTEST_CMD="${XVFB}pytest -v --full-trace -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" +PYTEST_CMD="${XVFB}pytest -r fEs -n $PYTEST_WORKERS --dist=loadfile $TEST_ARGS $COVERAGE $PYTEST_TARGET" if [[ "$PATTERN" ]]; then PYTEST_CMD="$PYTEST_CMD -m \"$PATTERN\""