Skip to content

Commit 7a8befd

Browse files
authored
upgrade SQLAlchemy and pyright (#687)
1 parent bd817d2 commit 7a8befd

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

pandas-stubs/io/sql.pyi

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ from typing import (
1313
from pandas.core.base import PandasObject
1414
from pandas.core.frame import DataFrame
1515
import sqlalchemy.engine
16+
from sqlalchemy.orm import FromStatement
1617
import sqlalchemy.sql.expression
1718
from typing_extensions import TypeAlias
1819

@@ -26,7 +27,11 @@ from pandas._typing import (
2627
_SQLConnection: TypeAlias = str | sqlalchemy.engine.Connectable | sqlite3.Connection
2728

2829
_SQLStatement: TypeAlias = (
29-
str | sqlalchemy.sql.expression.Selectable | sqlalchemy.sql.expression.TextClause
30+
str
31+
| sqlalchemy.sql.expression.Selectable
32+
| sqlalchemy.sql.expression.TextClause
33+
| sqlalchemy.sql.Select
34+
| FromStatement
3035
)
3136

3237
@overload

pyproject.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ types-pytz = ">= 2022.1.1"
3838
mypy = "1.2.0"
3939
pyarrow = ">=10.0.1"
4040
pytest = ">=7.1.2"
41-
pyright = ">= 1.1.305"
41+
pyright = ">= 1.1.306"
4242
poethepoet = ">=0.16.5"
4343
loguru = ">=0.6.0"
4444
pandas = "2.0.1"
@@ -60,7 +60,7 @@ xarray = ">=22.6.0"
6060
tabulate = ">=0.8.10"
6161
jinja2 = "^3.1"
6262
scipy = ">=1.9.1"
63-
SQLAlchemy = "<=1.4.45"
63+
SQLAlchemy = ">=2.0.12"
6464
types-python-dateutil = ">=2.8.19"
6565

6666
[build-system]
@@ -195,6 +195,7 @@ reportUnusedVariable = false
195195
reportPrivateUsage = false
196196
# enable optional checks
197197
reportMissingModuleSource = true
198+
useLibraryCodeForTypes = false
198199

199200
[tool.codespell]
200201
ignore-words-list = "indext, mose, sav, ser"

tests/test_io.py

+3
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,7 @@ def test_read_sql_via_sqlalchemy_connection():
10951095
assert_type(read_sql("select * from test", con=conn), DataFrame),
10961096
DataFrame,
10971097
)
1098+
engine.dispose()
10981099

10991100

11001101
def test_read_sql_via_sqlalchemy_engine():
@@ -1107,6 +1108,7 @@ def test_read_sql_via_sqlalchemy_engine():
11071108
assert_type(read_sql("select * from test", con=engine), DataFrame),
11081109
DataFrame,
11091110
)
1111+
engine.dispose()
11101112

11111113

11121114
def test_read_sql_generator():
@@ -1218,6 +1220,7 @@ def test_sqlalchemy_text() -> None:
12181220
assert_type(read_sql(sql_select, con=conn), DataFrame),
12191221
DataFrame,
12201222
)
1223+
engine.dispose()
12211224

12221225

12231226
def test_read_sql_dtype() -> None:

0 commit comments

Comments
 (0)