Skip to content

Commit

Permalink
troubleshoot
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrockmendel committed May 1, 2024
1 parent 08c2f92 commit a10cae5
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/deps/actions-39-minimum_versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion pandas/compat/_optional.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
3 changes: 2 additions & 1 deletion pandas/tests/io/test_sql.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]")
Expand Down
6 changes: 3 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit a10cae5

Please sign in to comment.