From a10cae55372df8c5eb5463ebdbc11aa586a16ff0 Mon Sep 17 00:00:00 2001 From: Brock Date: Wed, 1 May 2024 09:57:46 -0700 Subject: [PATCH] troubleshoot --- ci/deps/actions-39-minimum_versions.yaml | 2 +- pandas/compat/_optional.py | 2 +- pandas/tests/io/test_sql.py | 3 ++- pyproject.toml | 6 +++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ci/deps/actions-39-minimum_versions.yaml b/ci/deps/actions-39-minimum_versions.yaml index bc067a38f442c..b760f27a3d4d3 100644 --- a/ci/deps/actions-39-minimum_versions.yaml +++ b/ci/deps/actions-39-minimum_versions.yaml @@ -60,6 +60,6 @@ dependencies: - zstandard=0.19.0 - pip: - - adbc-driver-postgresql==0.11.0 + - adbc-driver-postgresql==0.10.0 - adbc-driver-sqlite==0.8.0 - tzdata==2022.7 diff --git a/pandas/compat/_optional.py b/pandas/compat/_optional.py index fb41ee2f3cb0e..f4e717c26d6fd 100644 --- a/pandas/compat/_optional.py +++ b/pandas/compat/_optional.py @@ -20,7 +20,7 @@ # deps_minimum.toml & pyproject.toml when updating versions! VERSIONS = { - "adbc-driver-postgresql": "0.11.0", + "adbc-driver-postgresql": "0.10.0", "adbc-driver-sqlite": "0.8.0", "bs4": "4.11.2", "blosc": "1.21.3", diff --git a/pandas/tests/io/test_sql.py b/pandas/tests/io/test_sql.py index aaefd93a23b31..93bc55a764c9b 100644 --- a/pandas/tests/io/test_sql.py +++ b/pandas/tests/io/test_sql.py @@ -1841,10 +1841,11 @@ def test_api_custom_dateparsing_error( "IntDateCol": "int32", "IntDateOnlyCol": "int32", "IntCol": "int32", + "DateCol": "datetime64[ns]", } ) - if "postgres" in conn_name or "mysql" in conn_name: + elif "postgres" in conn_name or "mysql" in conn_name: expected["DateCol"] = expected["DateCol"].astype("datetime64[us]") else: expected["DateCol"] = expected["DateCol"].astype("datetime64[s]") diff --git a/pyproject.toml b/pyproject.toml index f42de22ed0d3f..085c054f8241a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -73,16 +73,16 @@ hdf5 = [# blosc only available on conda (https://github.com/Blosc/python-blosc/i #'blosc>=1.20.1', 'tables>=3.8.0'] spss = ['pyreadstat>=1.2.0'] -postgresql = ['SQLAlchemy>=2.0.0', 'psycopg2>=2.9.6', 'adbc-driver-postgresql>=0.11.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.11.0', 'adbc-driver-sqlite>=0.8.0'] +sql-other = ['SQLAlchemy>=2.0.0', 'adbc-driver-postgresql>=0.10.0', 'adbc-driver-sqlite>=0.8.0'] html = ['beautifulsoup4>=4.11.2', 'html5lib>=1.1', 'lxml>=4.9.2'] xml = ['lxml>=4.9.2'] plot = ['matplotlib>=3.6.3'] 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.11.0', +all = ['adbc-driver-postgresql>=0.10.0', 'adbc-driver-sqlite>=0.8.0', 'beautifulsoup4>=4.11.2', # blosc only available on conda (https://github.com/Blosc/python-blosc/issues/297)