From 30eb89f3d911be98fffc173e2b6ea29551575706 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 27 Mar 2023 11:34:26 -0400 Subject: [PATCH 1/8] CI: Try running single_cpu/not single_cpu tests together --- .github/workflows/ubuntu.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index f990c6edaeb2a..faf4ea0e822e8 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,7 +26,6 @@ jobs: strategy: matrix: env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml] - pattern: ["not single_cpu", "single_cpu"] pyarrow_version: ["8", "9", "10"] include: - name: "Downstream Compat" @@ -100,7 +99,7 @@ jobs: PANDAS_COPY_ON_WRITE: ${{ matrix.pandas_copy_on_write || '0' }} PANDAS_CI: ${{ matrix.pandas_ci || '1' }} TEST_ARGS: ${{ matrix.test_args || '' }} - PYTEST_WORKERS: ${{ contains(matrix.pattern, 'not single_cpu') && 'auto' || '1' }} + PYTEST_WORKERS: 'auto' PYTEST_TARGET: ${{ matrix.pytest_target || 'pandas' }} IS_PYPY: ${{ contains(matrix.env_file, 'pypy') }} # TODO: re-enable coverage on pypy, its slow @@ -171,7 +170,19 @@ jobs: - name: Build Pandas uses: ./.github/actions/build_pandas - - name: Test + - name: Test (not single_cpu) uses: ./.github/actions/run-tests # TODO: Don't continue on error for PyPy continue-on-error: ${{ env.IS_PYPY == 'true' }} + with: + PATTERN: ${{ matrix.pattern || 'not single_cpu'}} + + - name: Test (single_cpu) + uses: ./.github/actions/run-tests + # TODO: Don't continue on error for PyPy + continue-on-error: ${{ env.IS_PYPY == 'true' }} + with: + PATTERN: 'single_cpu' + PYTEST_WORKERS: 1 + if: ${{ env.PATTERN == '' }} + From 096c376b5af53e64c2a97845c1ee280a97c7b2c2 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 27 Mar 2023 11:46:13 -0400 Subject: [PATCH 2/8] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index faf4ea0e822e8..62d13ec61acb6 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -26,6 +26,8 @@ jobs: strategy: matrix: env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml, actions-311.yaml] + # Prevent the include jobs from overriding other jobs + pattern: [""] pyarrow_version: ["8", "9", "10"] include: - name: "Downstream Compat" @@ -175,7 +177,8 @@ jobs: # TODO: Don't continue on error for PyPy continue-on-error: ${{ env.IS_PYPY == 'true' }} with: - PATTERN: ${{ matrix.pattern || 'not single_cpu'}} + # Set pattern to not single_cpu if not already set + PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }} - name: Test (single_cpu) uses: ./.github/actions/run-tests From 6f5bc0c4c60ba07b16f8b509962cf54cd4c30ceb Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 27 Mar 2023 12:17:27 -0400 Subject: [PATCH 3/8] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 62d13ec61acb6..8c890644ddf2f 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -176,7 +176,7 @@ jobs: uses: ./.github/actions/run-tests # TODO: Don't continue on error for PyPy continue-on-error: ${{ env.IS_PYPY == 'true' }} - with: + env: # Set pattern to not single_cpu if not already set PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }} @@ -184,7 +184,7 @@ jobs: uses: ./.github/actions/run-tests # TODO: Don't continue on error for PyPy continue-on-error: ${{ env.IS_PYPY == 'true' }} - with: + env: PATTERN: 'single_cpu' PYTEST_WORKERS: 1 if: ${{ env.PATTERN == '' }} From 7cef7326989c773bf116e5f9ab893a53a0a44238 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 27 Mar 2023 13:37:17 -0400 Subject: [PATCH 4/8] pre-commit fixes --- .github/workflows/ubuntu.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 8c890644ddf2f..6e6b6170e6386 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -179,7 +179,7 @@ jobs: env: # Set pattern to not single_cpu if not already set PATTERN: ${{ env.PATTERN == '' && 'not single_cpu' || matrix.pattern }} - + - name: Test (single_cpu) uses: ./.github/actions/run-tests # TODO: Don't continue on error for PyPy @@ -188,4 +188,3 @@ jobs: PATTERN: 'single_cpu' PYTEST_WORKERS: 1 if: ${{ env.PATTERN == '' }} - From 97f76c6a6d01abb5025501fc568e130a93df39cf Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 27 Mar 2023 18:03:20 -0400 Subject: [PATCH 5/8] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 6e6b6170e6386..aee36da29b59a 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -186,5 +186,5 @@ jobs: continue-on-error: ${{ env.IS_PYPY == 'true' }} env: PATTERN: 'single_cpu' - PYTEST_WORKERS: 1 - if: ${{ env.PATTERN == '' }} + PYTEST_WORKERS: 1 + if: ${{ matrix.pattern == '' }} From b74da348873ff1807e6f627989288de89728d4ec Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 27 Mar 2023 19:53:40 -0400 Subject: [PATCH 6/8] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index aee36da29b59a..1b79d8bf28251 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -186,5 +186,5 @@ jobs: continue-on-error: ${{ env.IS_PYPY == 'true' }} env: PATTERN: 'single_cpu' - PYTEST_WORKERS: 1 + PYTEST_WORKERS: 1 if: ${{ matrix.pattern == '' }} From 59902f2962d6693cd255dc8af8f4c6ecb11c758f Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 28 Mar 2023 17:04:40 -0400 Subject: [PATCH 7/8] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 1b79d8bf28251..856091383caea 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -187,4 +187,4 @@ jobs: env: PATTERN: 'single_cpu' PYTEST_WORKERS: 1 - if: ${{ matrix.pattern == '' }} + if: ${{ matrix.pattern == '' && always() && steps.build.outcome == 'success' && always()}} From 3e6e9ce86eaa74a9711f0e40b03b46f44d310b73 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 29 Mar 2023 13:33:27 -0400 Subject: [PATCH 8/8] Update ubuntu.yml --- .github/workflows/ubuntu.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 856091383caea..08dd09e57871b 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -170,6 +170,7 @@ jobs: pyarrow-version: ${{ matrix.pyarrow_version }} - name: Build Pandas + id: build uses: ./.github/actions/build_pandas - name: Test (not single_cpu) @@ -187,4 +188,4 @@ jobs: env: PATTERN: 'single_cpu' PYTEST_WORKERS: 1 - if: ${{ matrix.pattern == '' && always() && steps.build.outcome == 'success' && always()}} + if: ${{ matrix.pattern == '' && (always() && steps.build.outcome == 'success')}}