From 468e1a86ed18a275e700c931f72f12c5d78dc72e Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 11:06:41 -0800 Subject: [PATCH 1/7] CI: Test various Pyarrow version on Linux --- .github/workflows/posix.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 118a37e191673..2daba0986b5bd 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -26,6 +26,8 @@ jobs: matrix: env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] pattern: ["not single_cpu", "single_cpu"] + # Don't test pyarrow v2: Causes timeouts in read_csv engine + pyarrow_version: ["3", "5", "7"] include: - env_file: actions-38-downstream_compat.yaml pattern: "not slow and not network and not single_cpu" @@ -133,6 +135,10 @@ jobs: use-only-tar-bz2: true if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support + - name: Upgrade Arrow version + run: mamba update -n pandas-dev -c conda-forge pyarrow=${{ matrix.pyarrow_version }} + if: ${{ matrix.pyarrow_version }} + - name: Setup PyPy uses: actions/setup-python@v2 with: From 2c9e537e1dfa3bff60596d9c9bd0f24fcbb5a9f1 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 13:43:52 -0800 Subject: [PATCH 2/7] Ignore 3 and use conda --- .github/workflows/posix.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 2daba0986b5bd..63126d0001684 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -26,8 +26,8 @@ jobs: matrix: env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] pattern: ["not single_cpu", "single_cpu"] - # Don't test pyarrow v2: Causes timeouts in read_csv engine - pyarrow_version: ["3", "5", "7"] + # Don't test pyarrow v2/3: Causes timeouts in read_csv engine + pyarrow_version: ["5", "6", "7"] include: - env_file: actions-38-downstream_compat.yaml pattern: "not slow and not network and not single_cpu" @@ -136,7 +136,7 @@ jobs: if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support - name: Upgrade Arrow version - run: mamba update -n pandas-dev -c conda-forge pyarrow=${{ matrix.pyarrow_version }} + run: conda update -n pandas-dev -c conda-forge pyarrow=${{ matrix.pyarrow_version }} if: ${{ matrix.pyarrow_version }} - name: Setup PyPy From 067b65d6cdceb54b9132c932051403324ebc7c04 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 13:54:29 -0800 Subject: [PATCH 3/7] use conda install --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 63126d0001684..45b1b6778b7ca 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -136,7 +136,7 @@ jobs: if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support - name: Upgrade Arrow version - run: conda update -n pandas-dev -c conda-forge pyarrow=${{ matrix.pyarrow_version }} + run: conda install -n pandas-dev -c conda-forge pyarrow=${{ matrix.pyarrow_version }} if: ${{ matrix.pyarrow_version }} - name: Setup PyPy From 258ce99eb126cf8b1593547193de0f128f751161 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 14:26:33 -0800 Subject: [PATCH 4/7] fix concurrency group --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 45b1b6778b7ca..ca39a8e82e433 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -67,7 +67,7 @@ jobs: COVERAGE: ${{ !contains(matrix.env_file, 'pypy') }} concurrency: # 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.pattern }}-${{ matrix.extra_apt || '' }} + group: ${{ github.event_name == 'push' && github.run_number || github.ref }}-${{ matrix.env_file }}-${{ matrix.pattern }}-${{ matrix.pyarrow_version || '' }}-${{ matrix.extra_apt || '' }} cancel-in-progress: true services: From c2e465b988da932b92ed7aac48082f03c769188b Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 17:50:34 -0800 Subject: [PATCH 5/7] Don't update misc dependencies --- .github/workflows/posix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index ca39a8e82e433..4eba81fc971b3 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -136,7 +136,7 @@ jobs: if: ${{ env.IS_PYPY == 'false' }} # No pypy3.8 support - name: Upgrade Arrow version - run: conda install -n pandas-dev -c conda-forge pyarrow=${{ matrix.pyarrow_version }} + run: conda install -n pandas-dev -c conda-forge --no-update-deps pyarrow=${{ matrix.pyarrow_version }} if: ${{ matrix.pyarrow_version }} - name: Setup PyPy From 6d8cdadc328b5d17ad0bde3ce1c88ddffa48f883 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 18:54:52 -0800 Subject: [PATCH 6/7] Adjust gbq test --- pandas/tests/test_downstream.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pandas/tests/test_downstream.py b/pandas/tests/test_downstream.py index 72ce6b837e810..ce7c7a634f5a9 100644 --- a/pandas/tests/test_downstream.py +++ b/pandas/tests/test_downstream.py @@ -176,7 +176,8 @@ def test_seaborn(): def test_pandas_gbq(): - + # Older versions import from non-public, non-existent pandas funcs + pytest.importorskip("pandas_gbq", minversion="0.10.0") pandas_gbq = import_module("pandas_gbq") # noqa:F841 From 14812991a059426a05048f99139f3cf59c4e4cdd Mon Sep 17 00:00:00 2001 From: Matthew Roeschke Date: Fri, 18 Feb 2022 20:34:19 -0800 Subject: [PATCH 7/7] expand on comment --- .github/workflows/posix.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/posix.yml b/.github/workflows/posix.yml index 4eba81fc971b3..97683e56915c6 100644 --- a/.github/workflows/posix.yml +++ b/.github/workflows/posix.yml @@ -27,6 +27,7 @@ jobs: env_file: [actions-38.yaml, actions-39.yaml, actions-310.yaml] pattern: ["not single_cpu", "single_cpu"] # Don't test pyarrow v2/3: Causes timeouts in read_csv engine + # even if tests are skipped/xfailed pyarrow_version: ["5", "6", "7"] include: - env_file: actions-38-downstream_compat.yaml