From 7987f0378878073aa05c512858d4e9afebaae73c Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 26 Mar 2024 10:57:44 -0700 Subject: [PATCH 1/2] CI: Install adbc packages via conda forge --- ci/deps/actions-310.yaml | 4 ++-- ci/deps/actions-311-downstream_compat.yaml | 4 ++-- ci/deps/actions-311.yaml | 4 ++-- ci/deps/actions-312.yaml | 4 ++-- ci/deps/actions-39-minimum_versions.yaml | 4 ++-- ci/deps/actions-39.yaml | 4 ++-- ci/deps/circle-310-arm64.yaml | 5 ++--- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 1b68fa4fc22e6..ad67050786887 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -23,6 +23,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.10.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -57,7 +59,5 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 - pytest-localserver>=0.7.1 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 893e585cb890e..d4ae24e475d20 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -25,6 +25,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.10.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -72,6 +74,4 @@ dependencies: - pyyaml - py - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index 20124b24a6b9a..a8c0c5fff3590 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -23,6 +23,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.10.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -57,6 +59,4 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - pytest-localserver>=0.7.1 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index eb70816c241bb..a558b1e6719b7 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -23,6 +23,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.10.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -57,7 +59,5 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 - pytest-localserver>=0.7.1 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index 4399aa748af5c..90ef0db7eafe5 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -26,6 +26,8 @@ dependencies: - pytz=2020.1 # optional dependencies + - adbc-driver-postgresql=0.10.0 + - adbc-driver-sqlite=0.8.0 - beautifulsoup4=4.11.2 - blosc=1.21.3 - bottleneck=1.3.6 @@ -60,6 +62,4 @@ dependencies: - zstandard=0.19.0 - pip: - - adbc-driver-postgresql==0.10.0 - - adbc-driver-sqlite==0.8.0 - tzdata==2022.7 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 92df608f17c6c..42d86e24e8e88 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -23,6 +23,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.10.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -57,7 +59,5 @@ dependencies: - zstandard>=0.19.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2022.7 - pytest-localserver>=0.7.1 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index 869aae8596681..6774f11cc76d8 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -24,6 +24,8 @@ dependencies: - pytz # optional dependencies + - adbc-driver-postgresql>=0.10.0 + - adbc-driver-sqlite>=0.8.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -56,6 +58,3 @@ dependencies: - xlrd>=2.0.1 - xlsxwriter>=3.0.5 - zstandard>=0.19.0 - - pip: - - adbc-driver-postgresql>=0.8.0 - - adbc-driver-sqlite>=0.8.0 From 0cb8b6180645aa456c80b8f59bd72416dd2e32ba Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Tue, 26 Mar 2024 11:14:38 -0700 Subject: [PATCH 2/2] Bump sqlite package too --- ci/deps/actions-310.yaml | 2 +- ci/deps/actions-311-downstream_compat.yaml | 2 +- ci/deps/actions-311.yaml | 2 +- ci/deps/actions-312.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/v3.0.0.rst | 2 ++ pandas/compat/_optional.py | 2 +- pyproject.toml | 4 ++-- 11 files changed, 13 insertions(+), 11 deletions(-) diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index ad67050786887..f87b0ba6976a9 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -24,7 +24,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - adbc-driver-sqlite>=0.10.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index d4ae24e475d20..8c9c4b17971b7 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -26,7 +26,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - adbc-driver-sqlite>=0.10.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index a8c0c5fff3590..3ecd822b6b978 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -24,7 +24,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - adbc-driver-sqlite>=0.10.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index a558b1e6719b7..087a757daf7aa 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -24,7 +24,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - adbc-driver-sqlite>=0.10.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index 90ef0db7eafe5..a5bd2fda69316 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -27,7 +27,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql=0.10.0 - - adbc-driver-sqlite=0.8.0 + - adbc-driver-sqlite=0.10.0 - beautifulsoup4=4.11.2 - blosc=1.21.3 - bottleneck=1.3.6 diff --git a/ci/deps/actions-39.yaml b/ci/deps/actions-39.yaml index 42d86e24e8e88..654cbe25ef9e2 100644 --- a/ci/deps/actions-39.yaml +++ b/ci/deps/actions-39.yaml @@ -24,7 +24,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - adbc-driver-sqlite>=0.10.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 diff --git a/ci/deps/circle-310-arm64.yaml b/ci/deps/circle-310-arm64.yaml index 6774f11cc76d8..a81dd5b1d89a0 100644 --- a/ci/deps/circle-310-arm64.yaml +++ b/ci/deps/circle-310-arm64.yaml @@ -25,7 +25,7 @@ dependencies: # optional dependencies - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - adbc-driver-sqlite>=0.10.0 - beautifulsoup4>=4.11.2 - blosc>=1.21.3 - bottleneck>=1.3.6 diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 11c16dd9dabcc..00c7858f28633 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -347,7 +347,7 @@ SQLAlchemy 2.0.0 postgresql, SQL support for dat psycopg2 2.9.6 postgresql PostgreSQL engine for sqlalchemy pymysql 1.0.2 mysql MySQL engine for sqlalchemy adbc-driver-postgresql 0.10.0 postgresql ADBC Driver for PostgreSQL -adbc-driver-sqlite 0.8.0 sql-other ADBC Driver for SQLite +adbc-driver-sqlite 0.10.0 sql-other ADBC Driver for SQLite ========================= ================== =============== ============================================================= Other data sources diff --git a/doc/source/whatsnew/v3.0.0.rst b/doc/source/whatsnew/v3.0.0.rst index fb33601263c5d..da32689fc9366 100644 --- a/doc/source/whatsnew/v3.0.0.rst +++ b/doc/source/whatsnew/v3.0.0.rst @@ -138,6 +138,8 @@ Optional libraries below the lowest tested version may still work, but are not c +------------------------+---------------------+ | adbc-driver-postgresql | 0.10.0 | +------------------------+---------------------+ +| adbc-driver-sqlite | 0.10.0 | ++------------------------+---------------------+ See :ref:`install.dependencies` and :ref:`install.optional_dependencies` for more. diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index d6e01a168fba1..8fa504efd7a11 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -21,7 +21,7 @@ VERSIONS = { "adbc-driver-postgresql": "0.10.0", - "adbc-driver-sqlite": "0.8.0", + "adbc-driver-sqlite": "0.10.0", "bs4": "4.11.2", "blosc": "1.21.3", "bottleneck": "1.3.6", diff --git a/pyproject.toml b/pyproject.toml index 84d6eca552b54..67a9f2d187c7d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,7 +78,7 @@ hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/i spss = ['pyreadstat>=1.2.0'] postgresql = ['SQLAlchemy>=2.0.0', 'psycopg2>=2.9.6', 'adbc-driver-postgresql>=0.10.0'] mysql = ['SQLAlchemy>=2.0.0', 'pymysql>=1.0.2'] -sql-other = ['SQLAlchemy>=2.0.0', 'adbc-driver-postgresql>=0.10.0', 'adbc-driver-sqlite>=0.8.0'] +sql-other = ['SQLAlchemy>=2.0.0', 'adbc-driver-postgresql>=0.10.0', 'adbc-driver-sqlite>=0.10.0'] html = ['beautifulsoup4>=4.11.2', 'html5lib>=1.1', 'lxml>=4.9.2'] xml = ['lxml>=4.9.2'] plot = ['matplotlib>=3.6.3'] @@ -86,7 +86,7 @@ output-formatting = ['jinja2>=3.1.2', 'tabulate>=0.9.0'] clipboard = ['PyQt5>=5.15.9', 'qtpy>=2.3.0'] compression = ['zstandard>=0.19.0'] all = ['adbc-driver-postgresql>=0.10.0', - 'adbc-driver-sqlite>=0.8.0', + 'adbc-driver-sqlite>=0.10.0', 'beautifulsoup4>=4.11.2', # blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297) #'blosc>=1.21.3',