From c5bb92e8d5ee364e50ffc6fb8c705f32d555f66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 21:57:15 -0500 Subject: [PATCH 01/10] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgrade=20Ruff=20and?= =?UTF-8?q?=20Black?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements-docs-tests.txt | 4 +- requirements-docs.txt | 4 +- requirements-tests.txt | 2 +- sqlmodel/ext/asyncio/session.py | 6 +- sqlmodel/orm/session.py | 6 +- sqlmodel/sql/_expression_select_gen.py | 87 +++++++------------ sqlmodel/sql/_expression_select_gen.py.jinja2 | 6 +- 7 files changed, 40 insertions(+), 75 deletions(-) diff --git a/requirements-docs-tests.txt b/requirements-docs-tests.txt index 28f1ad1be..aa1758116 100644 --- a/requirements-docs-tests.txt +++ b/requirements-docs-tests.txt @@ -1,2 +1,2 @@ -# For mkdocstrings and code generator using templates -black >=22.10,<24.0 +# For mkdocstrings with Griffe and code generator using templates +black ==24.4.2 diff --git a/requirements-docs.txt b/requirements-docs.txt index cacb5dc2a..d3a1838af 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -12,7 +12,7 @@ pillow==10.1.0 # For image processing by Material for MkDocs cairosvg==2.7.0 mkdocstrings[python]==0.23.0 -griffe-typingdoc==0.2.2 +# Enable griffe-typingdoc once dropping Python 3.7 and upgrading typing-extensions +# griffe-typingdoc==0.2.5 # For griffe, it formats with black -black==23.3.0 typer == 0.12.3 diff --git a/requirements-tests.txt b/requirements-tests.txt index 3c2578e9c..8801bb9b9 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -3,7 +3,7 @@ pytest >=7.0.1,<8.0.0 coverage[toml] >=6.2,<8.0 mypy ==1.4.1 -ruff ==0.2.0 +ruff ==0.4.7 # For FastAPI tests fastapi >=0.103.2 httpx ==0.24.1 diff --git a/sqlmodel/ext/asyncio/session.py b/sqlmodel/ext/asyncio/session.py index 012d8ef5e..467d0bd84 100644 --- a/sqlmodel/ext/asyncio/session.py +++ b/sqlmodel/ext/asyncio/session.py @@ -43,8 +43,7 @@ async def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> TupleResult[_TSelectParam]: - ... + ) -> TupleResult[_TSelectParam]: ... @overload async def exec( @@ -56,8 +55,7 @@ async def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> ScalarResult[_TSelectParam]: - ... + ) -> ScalarResult[_TSelectParam]: ... async def exec( self, diff --git a/sqlmodel/orm/session.py b/sqlmodel/orm/session.py index e404bb137..b60875095 100644 --- a/sqlmodel/orm/session.py +++ b/sqlmodel/orm/session.py @@ -35,8 +35,7 @@ def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> TupleResult[_TSelectParam]: - ... + ) -> TupleResult[_TSelectParam]: ... @overload def exec( @@ -48,8 +47,7 @@ def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> ScalarResult[_TSelectParam]: - ... + ) -> ScalarResult[_TSelectParam]: ... def exec( self, diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index b6c15742f..08aa59ad6 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -111,8 +111,7 @@ @overload -def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: - ... +def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ... @overload @@ -127,32 +126,28 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], -) -> Select[Tuple[_T0, _T1]]: - ... +) -> Select[Tuple[_T0, _T1]]: ... @overload def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, -) -> Select[Tuple[_T0, _TScalar_1]]: - ... +) -> Select[Tuple[_T0, _TScalar_1]]: ... @overload def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], -) -> Select[Tuple[_TScalar_0, _T1]]: - ... +) -> Select[Tuple[_TScalar_0, _T1]]: ... @overload def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, -) -> Select[Tuple[_TScalar_0, _TScalar_1]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1]]: ... @overload @@ -160,8 +155,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], -) -> Select[Tuple[_T0, _T1, _T2]]: - ... +) -> Select[Tuple[_T0, _T1, _T2]]: ... @overload @@ -169,8 +163,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], entity_2: _TScalar_2, -) -> Select[Tuple[_T0, _T1, _TScalar_2]]: - ... +) -> Select[Tuple[_T0, _T1, _TScalar_2]]: ... @overload @@ -178,8 +171,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, __ent2: _TCCA[_T2], -) -> Select[Tuple[_T0, _TScalar_1, _T2]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _T2]]: ... @overload @@ -187,8 +179,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, entity_2: _TScalar_2, -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: ... @overload @@ -196,8 +187,7 @@ def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], -) -> Select[Tuple[_TScalar_0, _T1, _T2]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _T2]]: ... @overload @@ -205,8 +195,7 @@ def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], entity_2: _TScalar_2, -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: ... @overload @@ -214,8 +203,7 @@ def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, __ent2: _TCCA[_T2], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: ... @overload @@ -223,8 +211,7 @@ def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, entity_2: _TScalar_2, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: ... @overload @@ -233,8 +220,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _T1, _T2, _T3]]: - ... +) -> Select[Tuple[_T0, _T1, _T2, _T3]]: ... @overload @@ -243,8 +229,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: ... @overload @@ -253,8 +238,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: ... @overload @@ -263,8 +247,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: ... @overload @@ -273,8 +256,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: ... @overload @@ -283,8 +265,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: ... @overload @@ -293,8 +274,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: ... @overload @@ -303,8 +283,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: ... @overload @@ -313,8 +292,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: ... @overload @@ -323,8 +301,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: ... @overload @@ -333,8 +310,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: ... @overload @@ -343,8 +319,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: ... @overload @@ -353,8 +328,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: ... @overload @@ -363,8 +337,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: ... @overload @@ -373,8 +346,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: ... @overload @@ -383,8 +355,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: ... # Generated overloads end diff --git a/sqlmodel/sql/_expression_select_gen.py.jinja2 b/sqlmodel/sql/_expression_select_gen.py.jinja2 index 307e32b78..ef838e416 100644 --- a/sqlmodel/sql/_expression_select_gen.py.jinja2 +++ b/sqlmodel/sql/_expression_select_gen.py.jinja2 @@ -56,8 +56,7 @@ _T{{ i }} = TypeVar("_T{{ i }}") # Generated TypeVars end @overload -def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: - ... +def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ... @overload @@ -72,8 +71,7 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore @overload def select( # type: ignore {% for arg in signature[0] %}{{ arg.name }}: {{ arg.annotation }}, {% endfor %} - ) -> Select[Tuple[{%for ret in signature[1] %}{{ ret }} {% if not loop.last %}, {% endif %}{% endfor %}]]: - ... + ) -> Select[Tuple[{%for ret in signature[1] %}{{ ret }} {% if not loop.last %}, {% endif %}{% endfor %}]]: ... {% endfor %} From 3739f55b7aee4a1be2ecd1dc14bf415a9c88f46a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 02:57:45 +0000 Subject: [PATCH 02/10] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20f?= =?UTF-8?q?ormat=20from=20pre-commit.com=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sqlmodel/ext/asyncio/session.py | 6 +- sqlmodel/orm/session.py | 6 +- sqlmodel/sql/_expression_select_gen.py | 87 +++++++++++++++++--------- 3 files changed, 66 insertions(+), 33 deletions(-) diff --git a/sqlmodel/ext/asyncio/session.py b/sqlmodel/ext/asyncio/session.py index 467d0bd84..012d8ef5e 100644 --- a/sqlmodel/ext/asyncio/session.py +++ b/sqlmodel/ext/asyncio/session.py @@ -43,7 +43,8 @@ async def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> TupleResult[_TSelectParam]: ... + ) -> TupleResult[_TSelectParam]: + ... @overload async def exec( @@ -55,7 +56,8 @@ async def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> ScalarResult[_TSelectParam]: ... + ) -> ScalarResult[_TSelectParam]: + ... async def exec( self, diff --git a/sqlmodel/orm/session.py b/sqlmodel/orm/session.py index b60875095..e404bb137 100644 --- a/sqlmodel/orm/session.py +++ b/sqlmodel/orm/session.py @@ -35,7 +35,8 @@ def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> TupleResult[_TSelectParam]: ... + ) -> TupleResult[_TSelectParam]: + ... @overload def exec( @@ -47,7 +48,8 @@ def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> ScalarResult[_TSelectParam]: ... + ) -> ScalarResult[_TSelectParam]: + ... def exec( self, diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index 08aa59ad6..b6c15742f 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -111,7 +111,8 @@ @overload -def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ... +def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: + ... @overload @@ -126,28 +127,32 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], -) -> Select[Tuple[_T0, _T1]]: ... +) -> Select[Tuple[_T0, _T1]]: + ... @overload def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, -) -> Select[Tuple[_T0, _TScalar_1]]: ... +) -> Select[Tuple[_T0, _TScalar_1]]: + ... @overload def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], -) -> Select[Tuple[_TScalar_0, _T1]]: ... +) -> Select[Tuple[_TScalar_0, _T1]]: + ... @overload def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, -) -> Select[Tuple[_TScalar_0, _TScalar_1]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1]]: + ... @overload @@ -155,7 +160,8 @@ def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], -) -> Select[Tuple[_T0, _T1, _T2]]: ... +) -> Select[Tuple[_T0, _T1, _T2]]: + ... @overload @@ -163,7 +169,8 @@ def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], entity_2: _TScalar_2, -) -> Select[Tuple[_T0, _T1, _TScalar_2]]: ... +) -> Select[Tuple[_T0, _T1, _TScalar_2]]: + ... @overload @@ -171,7 +178,8 @@ def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, __ent2: _TCCA[_T2], -) -> Select[Tuple[_T0, _TScalar_1, _T2]]: ... +) -> Select[Tuple[_T0, _TScalar_1, _T2]]: + ... @overload @@ -179,7 +187,8 @@ def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, entity_2: _TScalar_2, -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: + ... @overload @@ -187,7 +196,8 @@ def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], -) -> Select[Tuple[_TScalar_0, _T1, _T2]]: ... +) -> Select[Tuple[_TScalar_0, _T1, _T2]]: + ... @overload @@ -195,7 +205,8 @@ def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], entity_2: _TScalar_2, -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: + ... @overload @@ -203,7 +214,8 @@ def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, __ent2: _TCCA[_T2], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: + ... @overload @@ -211,7 +223,8 @@ def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, entity_2: _TScalar_2, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: + ... @overload @@ -220,7 +233,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _T1, _T2, _T3]]: ... +) -> Select[Tuple[_T0, _T1, _T2, _T3]]: + ... @overload @@ -229,7 +243,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: ... +) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: + ... @overload @@ -238,7 +253,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: ... +) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: + ... @overload @@ -247,7 +263,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: ... +) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: + ... @overload @@ -256,7 +273,8 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: ... +) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: + ... @overload @@ -265,7 +283,8 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: ... +) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: + ... @overload @@ -274,7 +293,8 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: + ... @overload @@ -283,7 +303,8 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: + ... @overload @@ -292,7 +313,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: ... +) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: + ... @overload @@ -301,7 +323,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: ... +) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: + ... @overload @@ -310,7 +333,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: + ... @overload @@ -319,7 +343,8 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: + ... @overload @@ -328,7 +353,8 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: + ... @overload @@ -337,7 +363,8 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: + ... @overload @@ -346,7 +373,8 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: + ... @overload @@ -355,7 +383,8 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: + ... # Generated overloads end From 4bec513f7e64ec23140f52c73a8855b40f8028e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 21:58:59 -0500 Subject: [PATCH 03/10] =?UTF-8?q?=F0=9F=94=A7=20Update=20pre-commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .pre-commit-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3289dd095..6b2ad2b89 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: end-of-file-fixer - id: trailing-whitespace - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.2.0 + rev: v0.4.7 hooks: - id: ruff args: From 4ef0bb46bba85c5f085103bebef8f0b163f08ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 21:59:33 -0500 Subject: [PATCH 04/10] =?UTF-8?q?=F0=9F=8E=A8=20Format=20again=20after=20f?= =?UTF-8?q?ixing=20pre-commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sqlmodel/ext/asyncio/session.py | 6 +- sqlmodel/main.py | 12 ++-- sqlmodel/orm/session.py | 6 +- sqlmodel/sql/_expression_select_gen.py | 87 +++++++++----------------- 4 files changed, 37 insertions(+), 74 deletions(-) diff --git a/sqlmodel/ext/asyncio/session.py b/sqlmodel/ext/asyncio/session.py index 012d8ef5e..467d0bd84 100644 --- a/sqlmodel/ext/asyncio/session.py +++ b/sqlmodel/ext/asyncio/session.py @@ -43,8 +43,7 @@ async def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> TupleResult[_TSelectParam]: - ... + ) -> TupleResult[_TSelectParam]: ... @overload async def exec( @@ -56,8 +55,7 @@ async def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> ScalarResult[_TSelectParam]: - ... + ) -> ScalarResult[_TSelectParam]: ... async def exec( self, diff --git a/sqlmodel/main.py b/sqlmodel/main.py index 40051a522..505683f75 100644 --- a/sqlmodel/main.py +++ b/sqlmodel/main.py @@ -231,8 +231,7 @@ def Field( sa_column_args: Union[Sequence[Any], UndefinedType] = Undefined, sa_column_kwargs: Union[Mapping[str, Any], UndefinedType] = Undefined, schema_extra: Optional[Dict[str, Any]] = None, -) -> Any: - ... +) -> Any: ... @overload @@ -268,8 +267,7 @@ def Field( repr: bool = True, sa_column: Union[Column, UndefinedType] = Undefined, # type: ignore schema_extra: Optional[Dict[str, Any]] = None, -) -> Any: - ... +) -> Any: ... def Field( @@ -361,8 +359,7 @@ def Relationship( link_model: Optional[Any] = None, sa_relationship_args: Optional[Sequence[Any]] = None, sa_relationship_kwargs: Optional[Mapping[str, Any]] = None, -) -> Any: - ... +) -> Any: ... @overload @@ -371,8 +368,7 @@ def Relationship( back_populates: Optional[str] = None, link_model: Optional[Any] = None, sa_relationship: Optional[RelationshipProperty[Any]] = None, -) -> Any: - ... +) -> Any: ... def Relationship( diff --git a/sqlmodel/orm/session.py b/sqlmodel/orm/session.py index e404bb137..b60875095 100644 --- a/sqlmodel/orm/session.py +++ b/sqlmodel/orm/session.py @@ -35,8 +35,7 @@ def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> TupleResult[_TSelectParam]: - ... + ) -> TupleResult[_TSelectParam]: ... @overload def exec( @@ -48,8 +47,7 @@ def exec( bind_arguments: Optional[Dict[str, Any]] = None, _parent_execute_state: Optional[Any] = None, _add_event: Optional[Any] = None, - ) -> ScalarResult[_TSelectParam]: - ... + ) -> ScalarResult[_TSelectParam]: ... def exec( self, diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index b6c15742f..08aa59ad6 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -111,8 +111,7 @@ @overload -def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: - ... +def select(__ent0: _TCCA[_T0]) -> SelectOfScalar[_T0]: ... @overload @@ -127,32 +126,28 @@ def select(__ent0: _TScalar_0) -> SelectOfScalar[_TScalar_0]: # type: ignore def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], -) -> Select[Tuple[_T0, _T1]]: - ... +) -> Select[Tuple[_T0, _T1]]: ... @overload def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, -) -> Select[Tuple[_T0, _TScalar_1]]: - ... +) -> Select[Tuple[_T0, _TScalar_1]]: ... @overload def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], -) -> Select[Tuple[_TScalar_0, _T1]]: - ... +) -> Select[Tuple[_TScalar_0, _T1]]: ... @overload def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, -) -> Select[Tuple[_TScalar_0, _TScalar_1]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1]]: ... @overload @@ -160,8 +155,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], -) -> Select[Tuple[_T0, _T1, _T2]]: - ... +) -> Select[Tuple[_T0, _T1, _T2]]: ... @overload @@ -169,8 +163,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], __ent1: _TCCA[_T1], entity_2: _TScalar_2, -) -> Select[Tuple[_T0, _T1, _TScalar_2]]: - ... +) -> Select[Tuple[_T0, _T1, _TScalar_2]]: ... @overload @@ -178,8 +171,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, __ent2: _TCCA[_T2], -) -> Select[Tuple[_T0, _TScalar_1, _T2]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _T2]]: ... @overload @@ -187,8 +179,7 @@ def select( # type: ignore __ent0: _TCCA[_T0], entity_1: _TScalar_1, entity_2: _TScalar_2, -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2]]: ... @overload @@ -196,8 +187,7 @@ def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], -) -> Select[Tuple[_TScalar_0, _T1, _T2]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _T2]]: ... @overload @@ -205,8 +195,7 @@ def select( # type: ignore entity_0: _TScalar_0, __ent1: _TCCA[_T1], entity_2: _TScalar_2, -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2]]: ... @overload @@ -214,8 +203,7 @@ def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, __ent2: _TCCA[_T2], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2]]: ... @overload @@ -223,8 +211,7 @@ def select( # type: ignore entity_0: _TScalar_0, entity_1: _TScalar_1, entity_2: _TScalar_2, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2]]: ... @overload @@ -233,8 +220,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _T1, _T2, _T3]]: - ... +) -> Select[Tuple[_T0, _T1, _T2, _T3]]: ... @overload @@ -243,8 +229,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _T1, _T2, _TScalar_3]]: ... @overload @@ -253,8 +238,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_T0, _T1, _TScalar_2, _T3]]: ... @overload @@ -263,8 +247,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _T1, _TScalar_2, _TScalar_3]]: ... @overload @@ -273,8 +256,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _T2, _T3]]: ... @overload @@ -283,8 +265,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _T2, _TScalar_3]]: ... @overload @@ -293,8 +274,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _T3]]: ... @overload @@ -303,8 +283,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_T0, _TScalar_1, _TScalar_2, _TScalar_3]]: ... @overload @@ -313,8 +292,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _T2, _T3]]: ... @overload @@ -323,8 +301,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _T2, _TScalar_3]]: ... @overload @@ -333,8 +310,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _T3]]: ... @overload @@ -343,8 +319,7 @@ def select( # type: ignore __ent1: _TCCA[_T1], entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _T1, _TScalar_2, _TScalar_3]]: ... @overload @@ -353,8 +328,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _T3]]: ... @overload @@ -363,8 +337,7 @@ def select( # type: ignore entity_1: _TScalar_1, __ent2: _TCCA[_T2], entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _T2, _TScalar_3]]: ... @overload @@ -373,8 +346,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, __ent3: _TCCA[_T3], -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _T3]]: ... @overload @@ -383,8 +355,7 @@ def select( # type: ignore entity_1: _TScalar_1, entity_2: _TScalar_2, entity_3: _TScalar_3, -) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: - ... +) -> Select[Tuple[_TScalar_0, _TScalar_1, _TScalar_2, _TScalar_3]]: ... # Generated overloads end From 302a875c14690798e796e59d54cbc7adb024d7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 22:07:55 -0500 Subject: [PATCH 05/10] =?UTF-8?q?=E2=9C=85=20Add=20pytest=20test=20for=20s?= =?UTF-8?q?elect=20code=20gen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/test_select_gen.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tests/test_select_gen.py diff --git a/tests/test_select_gen.py b/tests/test_select_gen.py new file mode 100644 index 000000000..6d578f770 --- /dev/null +++ b/tests/test_select_gen.py @@ -0,0 +1,19 @@ +import subprocess +import sys +from pathlib import Path + +from .conftest import needs_py39 + +root_path = Path(__file__).parent.parent + + +@needs_py39 +def test_select_gen() -> None: + result = subprocess.run( + [sys.executable, "scripts/generate_select.py"], + env={"CHECK_JINJA": "1"}, + check=True, + cwd=root_path, + capture_output=True, + ) + print(result.stdout) From 1c96cdad990391802f1963d258114d988580855b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 22:08:21 -0500 Subject: [PATCH 06/10] =?UTF-8?q?=E2=AC=87=EF=B8=8F=20Update=20requirement?= =?UTF-8?q?=20for=20black=20to=20allow=20installing=20in=20Python=203.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements-docs-tests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-docs-tests.txt b/requirements-docs-tests.txt index aa1758116..c65317a7c 100644 --- a/requirements-docs-tests.txt +++ b/requirements-docs-tests.txt @@ -1,2 +1,2 @@ -# For mkdocstrings with Griffe and code generator using templates -black ==24.4.2 +# For mkdocstrings and code generator using templates +black >=22.10 From b696284f43ab0534e3ba8a195f6f0391715b79cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 22:08:47 -0500 Subject: [PATCH 07/10] =?UTF-8?q?=F0=9F=94=A8=20Update=20testing=20script?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/test.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/test.sh b/scripts/test.sh index 1460a9c7e..9b758bdbd 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -3,7 +3,6 @@ set -e set -x -CHECK_JINJA=1 python scripts/generate_select.py coverage run -m pytest tests coverage combine coverage report --show-missing From b92c49d3ee2fc84a7bce06903374bfb9019da3af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 22:11:04 -0500 Subject: [PATCH 08/10] =?UTF-8?q?=F0=9F=8D=BB=20Break=20expression=20selec?= =?UTF-8?q?t=20code=20gen=20to=20test=20new=20testing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sqlmodel/sql/_expression_select_gen.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index 08aa59ad6..d1eb76131 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -1,5 +1,8 @@ # WARNING: do not modify this code, it is generated by _expression_select_gen.py.jinja2 + + + from datetime import datetime from typing import ( Any, From 2fb7ed9883d2cd1c0cbd860699eb77e91f6e91cf Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 03:11:33 +0000 Subject: [PATCH 09/10] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20f?= =?UTF-8?q?ormat=20from=20pre-commit.com=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sqlmodel/sql/_expression_select_gen.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index d1eb76131..1650ef5c2 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -1,8 +1,6 @@ # WARNING: do not modify this code, it is generated by _expression_select_gen.py.jinja2 - - from datetime import datetime from typing import ( Any, From e715eb572778169eeb4d27d93f81a3c32a7cb15b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Ram=C3=ADrez?= Date: Mon, 3 Jun 2024 22:12:48 -0500 Subject: [PATCH 10/10] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20Update=20select=5Fge?= =?UTF-8?q?n,=20fix=20format=20after=20testing=20that=20new=20pytest=20tes?= =?UTF-8?q?ts=20work?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sqlmodel/sql/_expression_select_gen.py | 1 - 1 file changed, 1 deletion(-) diff --git a/sqlmodel/sql/_expression_select_gen.py b/sqlmodel/sql/_expression_select_gen.py index 1650ef5c2..08aa59ad6 100644 --- a/sqlmodel/sql/_expression_select_gen.py +++ b/sqlmodel/sql/_expression_select_gen.py @@ -1,6 +1,5 @@ # WARNING: do not modify this code, it is generated by _expression_select_gen.py.jinja2 - from datetime import datetime from typing import ( Any,