From 86f260ba708d07ce39e09d588061a0c1be05b0f0 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:03:48 -0700 Subject: [PATCH 1/6] CI: Bump pandas-gbq to one that doesn't pin pyarrow --- ci/deps/actions-310.yaml | 3 ++- ci/deps/actions-311-downstream_compat.yaml | 3 ++- ci/deps/actions-311.yaml | 3 ++- ci/deps/actions-39.yaml | 3 ++- ci/deps/circle-310-arm64.yaml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index ffa7732c604a0..257ca42866816 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -41,7 +41,8 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.2.0 - openpyxl>=3.0.10 - - pandas-gbq>=0.17.5 + # Bump pandas-gbq to one where pyarrow isn't pinned + - pandas-gbq>=0.19 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 596f3476c9c4e..63f8756dd1f0f 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -42,7 +42,8 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.2.0 - openpyxl>=3.0.10 - - pandas-gbq>=0.17.5 + # Bump pandas-gbq to one where pyarrow isn't pinned + - pandas-gbq>=0.19 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 9d60d734db5b3..86c3bedc55690 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -41,7 +41,8 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.2.0 - openpyxl>=3.0.10 - - pandas-gbq>=0.17.5 + # Bump pandas-gbq to one where pyarrow isn't pinned + - pandas-gbq>=0.19 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 6ea0d41b947dc..8b29cd38710d3 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -41,7 +41,8 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.2.0 - openpyxl>=3.0.10 - - pandas-gbq>=0.17.5 + # Bump pandas-gbq to one where pyarrow isn't pinned + - pandas-gbq>=0.19 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index df4e8e285bd02..8d00749ec7679 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -42,7 +42,8 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.2.0 - openpyxl>=3.0.10 - - pandas-gbq>=0.17.5 + # Bump pandas-gbq to one where pyarrow isn't pinned + - pandas-gbq>=0.19 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 From ec4b7294baadc7c9bfa0deda3b4a798781796c48 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 19 Jul 2023 17:46:35 -0700 Subject: [PATCH 2/6] bump everywhere --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311-downstream_compat.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-39-minimum_versions.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/circle-310-arm64.yaml | 2 +- doc/source/getting_started/install.rst | 2 +- pandas/compat/_optional.py | 2 +- pyproject.toml | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 257ca42866816..02a9bc9262364 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -42,7 +42,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.19 + - pandas-gbq>=0.18.1 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 63f8756dd1f0f..240d543bbf4e3 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -43,7 +43,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.19 + - pandas-gbq>=0.18.1 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 86c3bedc55690..9320f9ec07d15 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -42,7 +42,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.19 + - pandas-gbq>=0.18.1 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index 91961e4af2d1c..e403965fea2bf 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -43,7 +43,7 @@ dependencies: - odfpy=1.4.1 - qtpy=2.2.0 - openpyxl=3.0.10 - - pandas-gbq=0.17.5 + - pandas-gbq=0.18.1 - psycopg2=2.9.3 - pyarrow=7.0.0 - pymysql=1.0.2 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 8b29cd38710d3..d061c6505555b 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -42,7 +42,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.19 + - pandas-gbq>=0.18.1 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index 8d00749ec7679..210d33b430d0f 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -43,7 +43,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.19 + - pandas-gbq>=0.18.1 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 572c695d0e09d..4acab86e8b606 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -381,7 +381,7 @@ Dependency Minimum Version pip extra Notes fsspec 2022.05.0 fss, gcp, aws Handling files aside from simple local and HTTP (required dependency of s3fs, gcsfs). gcsfs 2022.05.0 gcp Google Cloud Storage access -pandas-gbq 0.17.5 gcp Google Big Query access +pandas-gbq 0.18.1 gcp Google Big Query access s3fs 2022.05.0 aws Amazon S3 access ========================= ================== =============== ============================================================= diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index dcd49f65fc4cd..763db71e8657f 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -31,7 +31,7 @@ "numexpr": "2.8.0", "odfpy": "1.4.1", "openpyxl": "3.0.10", - "pandas_gbq": "0.17.5", + "pandas_gbq": "0.18.1", "psycopg2": "2.9.3", # (dt dec pq3 ext lo64) "pymysql": "1.0.2", "pyarrow": "7.0.0", diff --git a/pyproject.toml b/pyproject.toml index 58671ee80d300..47ade1487e6f9 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,7 @@ performance = ['bottleneck>=1.3.4', 'numba>=0.55.2', 'numexpr>=2.8.0'] computation = ['scipy>=1.8.1', 'xarray>=2022.03.0'] fss = ['fsspec>=2022.05.0'] aws = ['s3fs>=2022.05.0'] -gcp = ['gcsfs>=2022.05.0', 'pandas-gbq>=0.17.5'] +gcp = ['gcsfs>=2022.05.0', 'pandas-gbq>=0.18.1'] excel = ['odfpy>=1.4.1', 'openpyxl>=3.0.10', 'pyxlsb>=1.0.9', 'xlrd>=2.0.1', 'xlsxwriter>=3.0.3'] parquet = ['pyarrow>=7.0.0'] feather = ['pyarrow>=7.0.0'] @@ -95,7 +95,7 @@ all = ['beautifulsoup4>=4.11.1', 'numexpr>=2.8.0', 'odfpy>=1.4.1', 'openpyxl>=3.0.10', - 'pandas-gbq>=0.17.5', + 'pandas-gbq>=0.18.1', 'psycopg2>=2.9.3', 'pyarrow>=7.0.0', 'pymysql>=1.0.2', From 7481b3885ae11c514ed4e53082341d0c3ce4dbdc Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Wed, 19 Jul 2023 17:55:51 -0700 Subject: [PATCH 3/6] change in whatsnew as well --- doc/source/whatsnew/v2.1.0.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/whatsnew/v2.1.0.rst b/doc/source/whatsnew/v2.1.0.rst index f2bf446c3bb6d..4ee50c3a454ca 100644 --- a/doc/source/whatsnew/v2.1.0.rst +++ b/doc/source/whatsnew/v2.1.0.rst @@ -240,7 +240,7 @@ If installed, we now require: +-----------------+-----------------+----------+---------+ | openpyxl | 3.0.10 | | X | +-----------------+-----------------+----------+---------+ -| pandas-gbq | 0.17.5 | | X | +| pandas-gbq | 0.18.1 | | X | +-----------------+-----------------+----------+---------+ | psycopg2 | 2.9.3 | | X | +-----------------+-----------------+----------+---------+ From a7f1372f68e0f0487c2d3c0ee105535b2a54fd98 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:57:08 -0700 Subject: [PATCH 4/6] bump to 0.19.0 instead --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311-downstream_compat.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-39-minimum_versions.yaml | 2 +- ci/deps/actions-39.yaml | 2 +- ci/deps/circle-310-arm64.yaml | 2 +- doc/source/getting_started/install.rst | 2 +- doc/source/whatsnew/v2.1.0.rst | 2 +- pandas/compat/_optional.py | 2 +- pyproject.toml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 02a9bc9262364..9d3ff5685c186 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -42,7 +42,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.18.1 + - pandas-gbq>=0.19.0 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 240d543bbf4e3..b4f1b70b6b21c 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -43,7 +43,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.18.1 + - pandas-gbq>=0.19.0 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 9320f9ec07d15..df6c9a63eab3f 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -42,7 +42,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.18.1 + - pandas-gbq>=0.19.0 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index e403965fea2bf..affb42583c5eb 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -43,7 +43,7 @@ dependencies: - odfpy=1.4.1 - qtpy=2.2.0 - openpyxl=3.0.10 - - pandas-gbq=0.18.1 + - pandas-gbq=0.19.0 - psycopg2=2.9.3 - pyarrow=7.0.0 - pymysql=1.0.2 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index d061c6505555b..1cb922d135008 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -42,7 +42,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.18.1 + - pandas-gbq>=0.19.0 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index 210d33b430d0f..bebc3750a1198 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -43,7 +43,7 @@ dependencies: - qtpy>=2.2.0 - openpyxl>=3.0.10 # Bump pandas-gbq to one where pyarrow isn't pinned - - pandas-gbq>=0.18.1 + - pandas-gbq>=0.19.0 - psycopg2>=2.9.3 - pyarrow>=7.0.0 - pymysql>=1.0.2 diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 4acab86e8b606..d6b72133264c9 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -381,7 +381,7 @@ Dependency Minimum Version pip extra Notes fsspec 2022.05.0 fss, gcp, aws Handling files aside from simple local and HTTP (required dependency of s3fs, gcsfs). gcsfs 2022.05.0 gcp Google Cloud Storage access -pandas-gbq 0.18.1 gcp Google Big Query access +pandas-gbq 0.19.0 gcp Google Big Query access s3fs 2022.05.0 aws Amazon S3 access ========================= ================== =============== ============================================================= diff --git a/doc/source/whatsnew/v2.1.0.rst b/doc/source/whatsnew/v2.1.0.rst index 4ee50c3a454ca..065c5a19178df 100644 --- a/doc/source/whatsnew/v2.1.0.rst +++ b/doc/source/whatsnew/v2.1.0.rst @@ -240,7 +240,7 @@ If installed, we now require: +-----------------+-----------------+----------+---------+ | openpyxl | 3.0.10 | | X | +-----------------+-----------------+----------+---------+ -| pandas-gbq | 0.18.1 | | X | +| pandas-gbq | 0.19.0 | | X | +-----------------+-----------------+----------+---------+ | psycopg2 | 2.9.3 | | X | +-----------------+-----------------+----------+---------+ diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index 763db71e8657f..3e8725d36929e 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -31,7 +31,7 @@ "numexpr": "2.8.0", "odfpy": "1.4.1", "openpyxl": "3.0.10", - "pandas_gbq": "0.18.1", + "pandas_gbq": "0.19.0", "psycopg2": "2.9.3", # (dt dec pq3 ext lo64) "pymysql": "1.0.2", "pyarrow": "7.0.0", diff --git a/pyproject.toml b/pyproject.toml index 47ade1487e6f9..5ae434d2b8952 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -61,7 +61,7 @@ performance = ['bottleneck>=1.3.4', 'numba>=0.55.2', 'numexpr>=2.8.0'] computation = ['scipy>=1.8.1', 'xarray>=2022.03.0'] fss = ['fsspec>=2022.05.0'] aws = ['s3fs>=2022.05.0'] -gcp = ['gcsfs>=2022.05.0', 'pandas-gbq>=0.18.1'] +gcp = ['gcsfs>=2022.05.0', 'pandas-gbq>=0.19.0'] excel = ['odfpy>=1.4.1', 'openpyxl>=3.0.10', 'pyxlsb>=1.0.9', 'xlrd>=2.0.1', 'xlsxwriter>=3.0.3'] parquet = ['pyarrow>=7.0.0'] feather = ['pyarrow>=7.0.0'] From 52483200b9cc2f0d515bceef2ee9ffcf090529e2 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Mon, 31 Jul 2023 06:55:46 -0700 Subject: [PATCH 5/6] last one? --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5ae434d2b8952..cd163714879ed 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -95,7 +95,7 @@ all = ['beautifulsoup4>=4.11.1', 'numexpr>=2.8.0', 'odfpy>=1.4.1', 'openpyxl>=3.0.10', - 'pandas-gbq>=0.18.1', + 'pandas-gbq>=0.19.0', 'psycopg2>=2.9.3', 'pyarrow>=7.0.0', 'pymysql>=1.0.2', From e91df803defb6826b300f57dc4264555578dc2b2 Mon Sep 17 00:00:00 2001 From: Thomas Li <47963215+lithomas1@users.noreply.github.com> Date: Sun, 22 Oct 2023 17:40:24 -0400 Subject: [PATCH 6/6] Update actions-39-minimum_versions.yaml --- ci/deps/actions-39-minimum_versions.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index cc0ad96afd672..5bc4f9d606b5e 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -42,7 +42,9 @@ dependencies: - odfpy=1.4.1 - qtpy=2.2.0 - openpyxl=3.0.10 - - pandas-gbq=0.19.0 + # pandas-gbq brings in a lot of other dependencies, so doesn't resolve properly + # as of 10/22/2023 with the pinned dependencies + #- pandas-gbq=0.19.0 - psycopg2=2.9.3 - pyarrow=7.0.0 - pymysql=1.0.2