diff --git a/ci/deps/actions-310-minimum_versions.yaml b/ci/deps/actions-310-minimum_versions.yaml index ee2d083ffc56f..6658b1495c43b 100644 --- a/ci/deps/actions-310-minimum_versions.yaml +++ b/ci/deps/actions-310-minimum_versions.yaml @@ -25,6 +25,8 @@ dependencies: - numpy=1.26.0 # optional dependencies + - adbc-driver-postgresql=1.2.0 + - adbc-driver-sqlite=1.2.0 - beautifulsoup4=4.12.3 - bottleneck=1.3.6 - fastparquet=2024.2.0 @@ -40,7 +42,7 @@ dependencies: - odfpy=1.4.1 - qtpy=2.3.0 - openpyxl=3.1.2 - - psycopg2=2.9.6 + - psycopg2=2.9.9 - pyarrow=12.0.1 - pyiceberg=0.7.1 - pymysql=1.1.0 @@ -60,6 +62,4 @@ dependencies: - zstandard=0.22.0 - pip: - - adbc-driver-postgresql==0.10.0 - - adbc-driver-sqlite==0.8.0 - tzdata==2023.3 diff --git a/ci/deps/actions-310.yaml b/ci/deps/actions-310.yaml index 83386f07b631c..b6eabefbc5e1b 100644 --- a/ci/deps/actions-310.yaml +++ b/ci/deps/actions-310.yaml @@ -23,6 +23,8 @@ dependencies: - numpy # optional dependencies + - adbc-driver-postgresql>=1.2.0 + - adbc-driver-sqlite>=1.2.0 - beautifulsoup4>=4.12.3 - bottleneck>=1.3.6 - fastparquet>=2024.2.0 @@ -38,7 +40,7 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.3.0 - openpyxl>=3.1.2 - - psycopg2>=2.9.6 + - psycopg2>=2.9.9 - pyarrow>=12.0.1 - pyiceberg>=0.7.1 - pymysql>=1.1.0 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.22.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2023.3 diff --git a/ci/deps/actions-311-downstream_compat.yaml b/ci/deps/actions-311-downstream_compat.yaml index 0cce1dc8ff79d..419a59cb32035 100644 --- a/ci/deps/actions-311-downstream_compat.yaml +++ b/ci/deps/actions-311-downstream_compat.yaml @@ -24,6 +24,7 @@ dependencies: - numpy # optional dependencies + - adbc-driver-postgresql>=1.2.0 - beautifulsoup4>=4.12.3 - bottleneck>=1.3.6 - fastparquet>=2024.2.0 @@ -39,7 +40,7 @@ dependencies: - odfpy>=1.4.1 - qtpy>=2.3.0 - openpyxl>=3.1.2 - - psycopg2>=2.9.6 + - psycopg2>=2.9.9 - pyarrow>=12.0.1 - pyiceberg>=0.7.1 - pymysql>=1.1.0 @@ -70,6 +71,4 @@ dependencies: - pandas-datareader - pyyaml - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2023.3 diff --git a/ci/deps/actions-311.yaml b/ci/deps/actions-311.yaml index deb646a7ba86a..f1a16bfc97656 100644 --- a/ci/deps/actions-311.yaml +++ b/ci/deps/actions-311.yaml @@ -23,6 +23,8 @@ dependencies: - numpy # optional dependencies + - adbc-driver-postgresql>=1.2.0 + - adbc-driver-sqlite>=1.2.0 - beautifulsoup4>=4.12.3 - bottleneck>=1.3.6 - fastparquet>=2024.2.0 @@ -39,7 +41,7 @@ dependencies: - qtpy>=2.3.0 - pyqt>=5.15.9 - openpyxl>=3.1.2 - - psycopg2>=2.9.6 + - psycopg2>=2.9.9 - pyarrow>=12.0.1 - pyiceberg>=0.7.1 - pymysql>=1.1.0 @@ -58,5 +60,4 @@ dependencies: - zstandard>=0.22.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 + - tzdata>=2023.3 diff --git a/ci/deps/actions-312.yaml b/ci/deps/actions-312.yaml index 5a24b0c1077d0..3222f372182ac 100644 --- a/ci/deps/actions-312.yaml +++ b/ci/deps/actions-312.yaml @@ -23,6 +23,8 @@ dependencies: - numpy # optional dependencies + - adbc-driver-postgresql>=1.2.0 + - adbc-driver-sqlite>=1.2.0 - beautifulsoup4>=4.12.3 - bottleneck>=1.3.6 - fastparquet>=2024.2.0 @@ -39,7 +41,7 @@ dependencies: - qtpy>=2.3.0 - pyqt>=5.15.9 - openpyxl>=3.1.2 - - psycopg2>=2.9.6 + - psycopg2>=2.9.9 - pyarrow>=12.0.1 - pyiceberg>=0.7.1 - pymysql>=1.1.0 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.22.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2023.3 diff --git a/ci/deps/actions-313.yaml b/ci/deps/actions-313.yaml index ffca09b901852..050d71cbfe45e 100644 --- a/ci/deps/actions-313.yaml +++ b/ci/deps/actions-313.yaml @@ -23,6 +23,8 @@ dependencies: - numpy # optional dependencies + - adbc-driver-postgresql>=1.2.0 + - adbc-driver-sqlite>=1.2.0 - beautifulsoup4>=4.12.3 - blosc>=1.21.3 - bottleneck>=1.3.6 @@ -40,7 +42,7 @@ dependencies: - qtpy>=2.3.0 - pyqt>=5.15.9 - openpyxl>=3.1.2 - - psycopg2>=2.9.6 + - psycopg2>=2.9.9 - pyarrow>=12.0.1 - pymysql>=1.1.0 - pyreadstat>=1.2.6 @@ -58,6 +60,4 @@ dependencies: - zstandard>=0.22.0 - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - tzdata>=2023.3 diff --git a/doc/source/getting_started/install.rst b/doc/source/getting_started/install.rst index 8bb93406f617d..0002ed869eb31 100644 --- a/doc/source/getting_started/install.rst +++ b/doc/source/getting_started/install.rst @@ -290,10 +290,10 @@ Dependency Minimum Versi `SQLAlchemy `__ 2.0.0 postgresql, SQL support for databases other than sqlite mysql, sql-other -`psycopg2 `__ 2.9.6 postgresql PostgreSQL engine for sqlalchemy +`psycopg2 `__ 2.9.9 postgresql PostgreSQL engine for sqlalchemy `pymysql `__ 1.1.0 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-postgresql `__ 1.2.0 postgresql ADBC Driver for PostgreSQL +`adbc-driver-sqlite `__ 1.2.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 e9996dcf8bc6a..f104c61ec28a5 100644 --- a/doc/source/whatsnew/v3.0.0.rst +++ b/doc/source/whatsnew/v3.0.0.rst @@ -333,7 +333,9 @@ Optional libraries below the lowest tested version may still work, but are not c +------------------------+---------------------+ | fastparquet | 2024.2.0 | +------------------------+---------------------+ -| adbc-driver-postgresql | 0.10.0 | +| adbc-driver-postgresql | 1.2.0 | ++------------------------+---------------------+ +| adbc-driver-sqlite | 1.2.0 | +------------------------+---------------------+ | mypy (dev) | 1.9.0 | +------------------------+---------------------+ @@ -353,6 +355,8 @@ Optional libraries below the lowest tested version may still work, but are not c +------------------------+---------------------+ | numexpr | 2.9.0 | +------------------------+---------------------+ +| psycopg2 | 2.9.9 | ++------------------------+---------------------+ | pymysql | 1.1.0 | +------------------------+---------------------+ | pyreadstat | 1.2.6 | diff --git a/environment.yml b/environment.yml index 2a566773b884a..773d763533427 100644 --- a/environment.yml +++ b/environment.yml @@ -26,6 +26,8 @@ dependencies: - numpy<3 # optional dependencies + - adbc-driver-postgresql>=1.2.0 + - adbc-driver-sqlite>=1.2.0 - beautifulsoup4>=4.12.3 - bottleneck>=1.3.6 - fastparquet>=2024.2.0 @@ -42,7 +44,7 @@ dependencies: - numexpr>=2.9.0 - openpyxl>=3.1.2 - odfpy>=1.4.1 - - psycopg2>=2.9.6 + - psycopg2>=2.9.9 - pyarrow>=12.0.1 - pyiceberg>=0.7.1 - pymysql>=1.1.0 @@ -120,7 +122,5 @@ dependencies: - jupyterlite-pyodide-kernel - pip: - - adbc-driver-postgresql>=0.10.0 - - adbc-driver-sqlite>=0.8.0 - typing_extensions; python_version<"3.11" - tzdata>=2023.3 diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index 7e882bc242394..da4d1c4f278bb 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -20,8 +20,8 @@ # deps_minimum.toml & pyproject.toml when updating versions! VERSIONS = { - "adbc-driver-postgresql": "0.10.0", - "adbc-driver-sqlite": "0.8.0", + "adbc-driver-postgresql": "1.2.0", + "adbc-driver-sqlite": "1.2.0", "bs4": "4.12.3", "bottleneck": "1.3.6", "fastparquet": "2024.2.0", @@ -36,7 +36,7 @@ "numexpr": "2.9.0", "odfpy": "1.4.1", "openpyxl": "3.1.2", - "psycopg2": "2.9.6", # (dt dec pq3 ext lo64) + "psycopg2": "2.9.9", # (dt dec pq3 ext lo64) "pymysql": "1.1.0", "pyarrow": "12.0.1", "pyiceberg": "0.7.1", diff --git a/pyproject.toml b/pyproject.toml index 5c836951961f2..d5a6c380e38f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,9 +70,9 @@ feather = ['pyarrow>=12.0.1'] iceberg = ['pyiceberg>=0.7.1'] hdf5 = ['tables>=3.8.0'] spss = ['pyreadstat>=1.2.6'] -postgresql = ['SQLAlchemy>=2.0.0', 'psycopg2>=2.9.6', 'adbc-driver-postgresql>=0.10.0'] +postgresql = ['SQLAlchemy>=2.0.0', 'psycopg2>=2.9.9', 'adbc-driver-postgresql>=1.2.0'] mysql = ['SQLAlchemy>=2.0.0', 'pymysql>=1.1.0'] -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>=1.2.0', 'adbc-driver-sqlite>=1.2.0'] html = ['beautifulsoup4>=4.12.3', 'html5lib>=1.1', 'lxml>=4.9.2'] xml = ['lxml>=4.9.2'] plot = ['matplotlib>=3.8.3'] @@ -80,8 +80,8 @@ output-formatting = ['jinja2>=3.1.3', 'tabulate>=0.9.0'] clipboard = ['PyQt5>=5.15.9', 'qtpy>=2.3.0'] compression = ['zstandard>=0.22.0'] timezone = ['pytz>=2023.4'] -all = ['adbc-driver-postgresql>=0.10.0', - 'adbc-driver-sqlite>=0.8.0', +all = ['adbc-driver-postgresql>=1.2.0', + 'adbc-driver-sqlite>=1.2.0', 'beautifulsoup4>=4.12.3', 'bottleneck>=1.3.6', 'fastparquet>=2024.2.0', @@ -96,7 +96,7 @@ all = ['adbc-driver-postgresql>=0.10.0', 'numexpr>=2.9.0', 'odfpy>=1.4.1', 'openpyxl>=3.1.2', - 'psycopg2>=2.9.6', + 'psycopg2>=2.9.9', 'pyarrow>=12.0.1', 'pyiceberg>=0.7.1', 'pymysql>=1.1.0', diff --git a/requirements-dev.txt b/requirements-dev.txt index 3e2e637927389..915517fadfa94 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -15,6 +15,8 @@ PyQt5>=5.15.9 coverage python-dateutil numpy<3 +adbc-driver-postgresql>=1.2.0 +adbc-driver-sqlite>=1.2.0 beautifulsoup4>=4.12.3 bottleneck>=1.3.6 fastparquet>=2024.2.0 @@ -31,7 +33,7 @@ numba>=0.59.0 numexpr>=2.9.0 openpyxl>=3.1.2 odfpy>=1.4.1 -psycopg2-binary>=2.9.6 +psycopg2-binary>=2.9.9 pyarrow>=12.0.1 pyiceberg>=0.7.1 pymysql>=1.1.0 @@ -83,7 +85,5 @@ requests pygments jupyterlite-core jupyterlite-pyodide-kernel -adbc-driver-postgresql>=0.10.0 -adbc-driver-sqlite>=0.8.0 typing_extensions; python_version<"3.11" tzdata>=2023.3 diff --git a/scripts/tests/data/deps_expected_random.yaml b/scripts/tests/data/deps_expected_random.yaml index d4ecd9f64a68d..438d269f59902 100644 --- a/scripts/tests/data/deps_expected_random.yaml +++ b/scripts/tests/data/deps_expected_random.yaml @@ -36,7 +36,7 @@ dependencies: - numexpr>=2.7.3 - openpyxl>=3.0.7 - odfpy>=1.4.1 - - psycopg2>=2.8.6 + - psycopg2>=2.9.9 - pyarrow<11, >=7.0.0 - pymysql>=1.1.0 - pyreadstat>=1.1.2 diff --git a/scripts/tests/data/deps_minimum.toml b/scripts/tests/data/deps_minimum.toml index e6135ca088772..b8648364143d7 100644 --- a/scripts/tests/data/deps_minimum.toml +++ b/scripts/tests/data/deps_minimum.toml @@ -65,7 +65,7 @@ parquet = ['pyarrow>=7.0.0'] feather = ['pyarrow>=7.0.0'] hdf5 = ['tables>=3.6.1'] spss = ['pyreadstat>=1.1.2'] -postgresql = ['SQLAlchemy>=1.4.16', 'psycopg2>=2.8.6'] +postgresql = ['SQLAlchemy>=1.4.16', 'psycopg2>=2.9.9'] mysql = ['SQLAlchemy>=1.4.16', 'pymysql>=1.1.0'] sql-other = ['SQLAlchemy>=1.4.16'] html = ['beautifulsoup4>=4.9.3', 'html5lib>=1.1', 'lxml>=4.6.3'] @@ -88,7 +88,7 @@ all = ['beautifulsoup4>=5.9.3', 'numexpr>=2.7.3', 'odfpy>=1.4.1', 'openpyxl>=3.0.7', - 'psycopg2>=2.8.6', + 'psycopg2>=2.9.9', 'pyarrow>=7.0.0', 'pymysql>=1.1.0', 'PyQt5>=5.15.1',