⬆️ Upgrade Ruff and Black (#968)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3289dd0950a52e68ae22ab7787c69941b3442600..6b2ad2b8955a17591c945d2b66e8f77136a89d8c 100644 (file)
--- 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:

diff --git a/requirements-docs-tests.txt b/requirements-docs-tests.txt
index 28f1ad1be94a2f18493bda2709ef10fa778f577e..c65317a7cf96bce8d7a5a9c2ebff353af8b81f0c 100644 (file)
--- 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
+black >=22.10

diff --git a/requirements-docs.txt b/requirements-docs.txt
index cacb5dc2a33de4a5c941e4af8ec8fbfd09290c93..d3a1838af8f0380624ea31baea45cc27a127c368 100644 (file)
--- 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 3c2578e9c59c2d7c6a14a7d1d07578f572ac40a9..8801bb9b917fcbdc99d5d8def7b8eb2de5c83edf 100644 (file)
--- 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/scripts/test.sh b/scripts/test.sh
index 1460a9c7ecc20de9e77fcbad55990fccc70b28fa..9b758bdbdfc669c64a0bd2a34e3ba85f23750ac6 100755 (executable)
--- 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

diff --git a/sqlmodel/ext/asyncio/session.py b/sqlmodel/ext/asyncio/session.py
index 012d8ef5e494293ba8d7938309efa30f1e14c1f7..467d0bd84eeb9fc669beb462cee80b55ed5079f5 100644 (file)
--- a/sqlmodel/ext/asyncio/session.py
+++ b/sqlmodel/ext/asyncio/session.py
@@ -43,8 +43,7 @@ class AsyncSession(_AsyncSession):
         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 @@ class AsyncSession(_AsyncSession):
         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 40051a522c412f22e6420678235c486fb6cd5029..505683f756c718783943ee6deaea7e59546748a3 100644 (file)
--- 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 e404bb137d794c5b354c1ef7bebbbf85704372ac..b60875095bd546769bde36715424510fe1a25153 100644 (file)
--- a/sqlmodel/orm/session.py
+++ b/sqlmodel/orm/session.py
@@ -35,8 +35,7 @@ class Session(_Session):
         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 @@ class Session(_Session):
         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 b6c15742fa15af440da875c9182e901d7b517b6e..08aa59ad613d56a6a6252afbb2710847f797ece4 100644 (file)
--- a/sqlmodel/sql/_expression_select_gen.py
+++ b/sqlmodel/sql/_expression_select_gen.py
@@ -111,8 +111,7 @@ _T3 = TypeVar("_T3")
 
 
 @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 307e32b78429cb9539b95eb31fcbcfac8e3168f2..ef838e4168a1bd112d76a01ad3a06a3b1aba2daa 100644 (file)
--- 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 %}
 

diff --git a/tests/test_select_gen.py b/tests/test_select_gen.py
new file mode 100644 (file)
index 0000000..6d578f7
--- /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)