From 11f7cf3c73d7225c5458b1cf1ae902dacd02f761 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 27 Dec 2022 14:42:12 -0800 Subject: [PATCH 1/2] CI: Reduce duplicate pyarrow version testing --- .github/workflows/macos-windows.yml | 2 +- .github/workflows/ubuntu.yml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/macos-windows.yml b/.github/workflows/macos-windows.yml index ca6fd63d749ee..5efc1aa67b4cd 100644 --- a/.github/workflows/macos-windows.yml +++ b/.github/workflows/macos-windows.yml @@ -53,7 +53,7 @@ jobs: uses: ./.github/actions/setup-conda with: environment-file: ci/deps/${{ matrix.env_file }} - pyarrow-version: ${{ matrix.os == 'macos-latest' && '6' || '' }} + pyarrow-version: ${{ matrix.os == 'macos-latest' && '9' || '' }} - name: Build Pandas uses: ./.github/actions/build_pandas diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index fe4d92507f717..81b793762c766 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -79,13 +79,17 @@ jobs: test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy" exclude: - env_file: actions-39.yaml - pyarrow_version: "6" + pyarrow_version: "7" + - env_file: actions-39.yaml + pyarrow_version: "8" - env_file: actions-39.yaml + pyarrow_version: "9" + - env_file: actions-310.yaml pyarrow_version: "7" - env_file: actions-310.yaml - pyarrow_version: "6" + pyarrow_version: "8" - env_file: actions-310.yaml - pyarrow_version: "7" + pyarrow_version: "9" fail-fast: false name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }} env: From 0057b16902c31191782f714e478fe4d4fe2a9cae Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 27 Dec 2022 16:36:58 -0800 Subject: [PATCH 2/2] Run different version on 3.10 instead of 3.8 --- .github/workflows/ubuntu.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 81b793762c766..7dbf74278d433 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -78,17 +78,17 @@ jobs: pattern: "not slow and not network and not single_cpu" test_args: "-W error::DeprecationWarning:numpy -W error::FutureWarning:numpy" exclude: - - env_file: actions-39.yaml + - env_file: actions-38.yaml pyarrow_version: "7" - - env_file: actions-39.yaml + - env_file: actions-38.yaml pyarrow_version: "8" - - env_file: actions-39.yaml + - env_file: actions-38.yaml pyarrow_version: "9" - - env_file: actions-310.yaml + - env_file: actions-39.yaml pyarrow_version: "7" - - env_file: actions-310.yaml + - env_file: actions-39.yaml pyarrow_version: "8" - - env_file: actions-310.yaml + - env_file: actions-39.yaml pyarrow_version: "9" fail-fast: false name: ${{ matrix.name || format('{0} pyarrow={1} {2}', matrix.env_file, matrix.pyarrow_version, matrix.pattern) }}