From 792e923d99f28dd236225b9180bd6c61a2c2d68d Mon Sep 17 00:00:00 2001 From: Patrick Hoefler Date: Sun, 4 Dec 2022 17:20:27 +0100 Subject: [PATCH 1/3] CI: Pin pyarrow smaller than 10 --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/circle-38-arm64.yaml | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 1f6f73f3c963f..25623d9826030 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -42,7 +42,7 @@ dependencies: - psycopg2 - pymysql - pytables - - pyarrow + - pyarrow<10 - pyreadstat - python-snappy - pyxlsb diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 1c59b9db9b1fa..15ce02204ee99 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -41,7 +41,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow + - pyarrow<10 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 48b9d18771afb..c93af914c2277 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -40,7 +40,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow + - pyarrow<10 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 59191ad107d12..f6240ae7611b9 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -41,7 +41,7 @@ dependencies: - pandas-gbq - psycopg2 - pymysql - - pyarrow + - pyarrow<10 - pyreadstat - pytables - python-snappy diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index 63547d3521489..2095850aa4d3a 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -40,7 +40,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow + - pyarrow<10 - pymysql # Not provided on ARM #- pyreadstat diff --git a/environment.yml b/environment.yml index 87c5f5d031fcf..70884f4ca98a3 100644 --- a/environment.yml +++ b/environment.yml @@ -42,7 +42,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow + - pyarrow<10 - pymysql - pyreadstat - pytables diff --git a/requirements-dev.txt b/requirements-dev.txt index debbdb635901c..caa3dd49add3b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -31,7 +31,7 @@ openpyxl odfpy pandas-gbq psycopg2-binary -pyarrow +pyarrow<10 pymysql pyreadstat tables From 114f96f8655d8a907814aed46aa6f54b7e2a7c37 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Sun, 4 Dec 2022 14:48:05 +0000 Subject: [PATCH 2/3] try fixing syntax --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/circle-38-arm64.yaml | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 25623d9826030..0e2a26af9bf08 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -42,7 +42,7 @@ dependencies: - psycopg2 - pymysql - pytables - - pyarrow<10 + - pyarrow<10.0.0 - pyreadstat - python-snappy - pyxlsb diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 15ce02204ee99..328b84666f366 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -41,7 +41,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10 + - pyarrow<10.0.0 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index c93af914c2277..7ce891e3b106d 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -40,7 +40,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10 + - pyarrow<10.0.0 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index f6240ae7611b9..042c95ae40f5b 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -41,7 +41,7 @@ dependencies: - pandas-gbq - psycopg2 - pymysql - - pyarrow<10 + - pyarrow<10.0.0 - pyreadstat - pytables - python-snappy diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index 2095850aa4d3a..de81051079391 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -40,7 +40,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10 + - pyarrow<10.0.0 - pymysql # Not provided on ARM #- pyreadstat diff --git a/environment.yml b/environment.yml index 70884f4ca98a3..c29dcec5875b7 100644 --- a/environment.yml +++ b/environment.yml @@ -42,7 +42,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10 + - pyarrow<10.0.0 - pymysql - pyreadstat - pytables diff --git a/requirements-dev.txt b/requirements-dev.txt index caa3dd49add3b..5f9de414d05ec 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -31,7 +31,7 @@ openpyxl odfpy pandas-gbq psycopg2-binary -pyarrow<10 +pyarrow<10.0.0 pymysql pyreadstat tables From e5d4e003cd5c0241ba7d208c6f7d7b183f179e00 Mon Sep 17 00:00:00 2001 From: MarcoGorelli <> Date: Sun, 4 Dec 2022 14:57:35 +0000 Subject: [PATCH 3/3] fixup sed --- .github/actions/setup-conda/action.yml | 2 +- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-38-downstream_compat.yaml | 2 +- ci/deps/actions-38.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/circle-38-arm64.yaml | 2 +- environment.yml | 2 +- requirements-dev.txt | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/setup-conda/action.yml b/.github/actions/setup-conda/action.yml index 002d0020c2df1..7d1e54052f938 100644 --- a/.github/actions/setup-conda/action.yml +++ b/.github/actions/setup-conda/action.yml @@ -18,7 +18,7 @@ runs: - 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 }} + sed -i"" -e "s/ - pyarrow<10/ - pyarrow=${{ inputs.pyarrow-version }}/" ${{ inputs.environment-file }} cat ${{ inputs.environment-file }} shell: bash if: ${{ inputs.pyarrow-version }} diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 0e2a26af9bf08..25623d9826030 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -42,7 +42,7 @@ dependencies: - psycopg2 - pymysql - pytables - - pyarrow<10.0.0 + - pyarrow<10 - pyreadstat - python-snappy - pyxlsb diff --git a/ci/deps/actions-38-downstream_compat.yaml b/ci/deps/actions-38-downstream_compat.yaml index 328b84666f366..15ce02204ee99 100644 --- a/ci/deps/actions-38-downstream_compat.yaml +++ b/ci/deps/actions-38-downstream_compat.yaml @@ -41,7 +41,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10.0.0 + - pyarrow<10 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-38.yaml b/ci/deps/actions-38.yaml index 7ce891e3b106d..c93af914c2277 100644 --- a/ci/deps/actions-38.yaml +++ b/ci/deps/actions-38.yaml @@ -40,7 +40,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10.0.0 + - pyarrow<10 - pymysql - pyreadstat - pytables diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 042c95ae40f5b..f6240ae7611b9 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -41,7 +41,7 @@ dependencies: - pandas-gbq - psycopg2 - pymysql - - pyarrow<10.0.0 + - pyarrow<10 - pyreadstat - pytables - python-snappy diff --git a/ci/deps/circle-38-arm64.yaml b/ci/deps/circle-38-arm64.yaml index de81051079391..2095850aa4d3a 100644 --- a/ci/deps/circle-38-arm64.yaml +++ b/ci/deps/circle-38-arm64.yaml @@ -40,7 +40,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10.0.0 + - pyarrow<10 - pymysql # Not provided on ARM #- pyreadstat diff --git a/environment.yml b/environment.yml index c29dcec5875b7..70884f4ca98a3 100644 --- a/environment.yml +++ b/environment.yml @@ -42,7 +42,7 @@ dependencies: - odfpy - pandas-gbq - psycopg2 - - pyarrow<10.0.0 + - pyarrow<10 - pymysql - pyreadstat - pytables diff --git a/requirements-dev.txt b/requirements-dev.txt index 5f9de414d05ec..caa3dd49add3b 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -31,7 +31,7 @@ openpyxl odfpy pandas-gbq psycopg2-binary -pyarrow<10.0.0 +pyarrow<10 pymysql pyreadstat tables