🔀 Merge branch 'main' into sa2-a

fastapi · tiangolo · Nov 18, 2023 · Mar 7, 2023 · Mar 24, 2023 · Mar 24, 2023
commit b4f4a4f6fe7d20111efe88e535e77abac8fd1e76
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -20,7 +20,11 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
      fail-fast: false

    steps:

diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ It combines SQLAlchemy and Pydantic and tries to simplify the code you write as

 ## Requirements

-A recent and currently supported version of Python (right now, <a href="https://www.python.org/downloads/" class="external-link" target="_blank">Python supports versions 3.7 and above</a>).
+A recent and currently supported <a href="https://www.python.org/downloads/" class="external-link" target="_blank">version of Python</a>.

 As **SQLModel** is based on **Pydantic** and **SQLAlchemy**, it requires them. They will be automatically installed when you install SQLModel.


diff --git a/docs/contributing.md b/docs/contributing.md
@@ -6,10 +6,6 @@ First, you might want to see the basic ways to [help SQLModel and get help](help

 If you already cloned the repository and you know that you need to deep dive in the code, here are some guidelines to set up your environment.

-### Python
-
-SQLModel supports Python 3.7 and above.
-
 ### Poetry

 **SQLModel** uses <a href="https://python-poetry.org/" class="external-link" target="_blank">Poetry</a> to build, package, and publish the project.

diff --git a/docs/features.md b/docs/features.md
@@ -12,7 +12,7 @@ Nevertheless, SQLModel is completely **independent** of FastAPI and can be used

 ## Just Modern Python

-It's all based on standard <abbr title="Python currently supported versions, 3.7 and above.">modern **Python**</abbr> type annotations. No new syntax to learn. Just standard modern Python.
+It's all based on standard <abbr title="Currently supported versions of Python">modern **Python**</abbr> type annotations. No new syntax to learn. Just standard modern Python.

 If you need a 2 minute refresher of how to use Python types (even if you don't use SQLModel or FastAPI), check the FastAPI tutorial section: <a href="https://fastapi.tiangolo.com/python-types/" class="external-link" target="_blank">Python types intro</a>.


diff --git a/docs/index.md b/docs/index.md
@@ -50,7 +50,7 @@ It combines SQLAlchemy and Pydantic and tries to simplify the code you write as

 ## Requirements

-A recent and currently supported version of Python (right now, <a href="https://www.python.org/downloads/" class="external-link" target="_blank">Python supports versions 3.7 and above</a>).
+A recent and currently supported <a href="https://www.python.org/downloads/" class="external-link" target="_blank">version of Python</a>.

 As **SQLModel** is based on **Pydantic** and **SQLAlchemy**, it requires them. They will be automatically installed when you install SQLModel.


diff --git a/docs/tutorial/index.md b/docs/tutorial/index.md
@@ -64,8 +64,6 @@ $ cd sqlmodel-tutorial

 Make sure you have an officially supported version of Python.

-Currently it is **Python 3.7** and above (Python 3.6 was already deprecated).
-
 You can check which version you have with:

 <div class="termy">
@@ -85,7 +83,6 @@ You might want to try with the specific versions, for example with:
 * `python3.10`
 * `python3.9`
 * `python3.8`
-* `python3.7`

 The code would look like this:


diff --git a/pyproject.toml b/pyproject.toml
@@ -21,7 +21,6 @@ classifiers = [
    "Programming Language :: Python :: 3.8",
    "Programming Language :: Python :: 3.9",
    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
    "Topic :: Database",
    "Topic :: Database :: Database Engines/Servers",
    "Topic :: Internet",
@@ -32,8 +31,8 @@ classifiers = [

 [tool.poetry.dependencies]
 python = "^3.7"
-SQLAlchemy = ">=2.0.0,<=2.0.11"
-pydantic = "^1.8.2"
+SQLAlchemy = ">=2.0.0,<=2.1.0"
+pydantic = "^1.9.0"

 [tool.poetry.group.dev.dependencies]
 pytest = "^7.0.1"
@@ -47,10 +46,7 @@ mdx-include = "^1.4.1"
 coverage = {extras = ["toml"], version = ">=6.2,<8.0"}
 fastapi = "^0.68.1"
 requests = "^2.26.0"
-autoflake = "^1.4"
-isort = "^5.9.3"
-async_generator = {version = "*", python = "~3.7"}
-async-exit-stack = {version = "*", python = "~3.7"}
+ruff = "^0.1.2"

 [build-system]
 requires = ["poetry-core"]

diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -4,6 +4,5 @@ set -e
 set -x

 mypy sqlmodel
-flake8 sqlmodel tests docs_src
-black sqlmodel tests docs_src --check
-isort sqlmodel tests docs_src scripts --check-only
+ruff sqlmodel tests docs_src scripts
+ruff format sqlmodel tests docs_src --check
diff --git a/sqlmodel/__init__.py b/sqlmodel/__init__.py
@@ -30,6 +30,7 @@
 from sqlalchemy.sql import (
    LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL,
 )
+from sqlalchemy.sql import Subquery as Subquery
 from sqlalchemy.sql import alias as alias
 from sqlalchemy.sql import all_ as all_
 from sqlalchemy.sql import and_ as and_
@@ -70,7 +71,6 @@
 from sqlalchemy.sql import outerjoin as outerjoin
 from sqlalchemy.sql import outparam as outparam
 from sqlalchemy.sql import over as over
-from sqlalchemy.sql import Subquery as Subquery
 from sqlalchemy.sql import table as table
 from sqlalchemy.sql import tablesample as tablesample
 from sqlalchemy.sql import text as text

diff --git a/sqlmodel/orm/session.py b/sqlmodel/orm/session.py
@@ -16,7 +16,6 @@
 from sqlalchemy.orm import Session as _Session
 from sqlalchemy.sql.base import Executable as _Executable
 from sqlalchemy.sql.selectable import ForUpdateArg as _ForUpdateArg
-from sqlmodel.sql.expression import Select, SelectOfScalar

 from ..engine.result import Result, ScalarResult
 from ..sql.base import Executable

diff --git a/sqlmodel/sql/expression.py b/sqlmodel/sql/expression.py
@@ -4,7 +4,6 @@
 from typing import (
    TYPE_CHECKING,
    Any,
-    Generic,
    Mapping,
    Sequence,
    Tuple,
@@ -23,15 +22,15 @@
 _TSelect = TypeVar("_TSelect")


-class Select(_Select[Tuple[_TSelect]], Generic[_TSelect]):
+class Select(_Select[Tuple[_TSelect]]):
    inherit_cache = True


 # This is not comparable to sqlalchemy.sql.selectable.ScalarSelect, that has a different
 # purpose. This is the same as a normal SQLAlchemy Select class where there's only one
 # entity, so the result will be converted to a scalar by default. This way writing
 # for loops on the results will feel natural.
-class SelectOfScalar(_Select[Tuple[_TSelect]], Generic[_TSelect]):
+class SelectOfScalar(_Select[Tuple[_TSelect]]):
    inherit_cache = True



diff --git a/sqlmodel/sql/expression.py.jinja2 b/sqlmodel/sql/expression.py.jinja2
@@ -2,7 +2,6 @@ from datetime import datetime
 from typing import (
    TYPE_CHECKING,
    Any,
-    Generic,
    Mapping,
    Sequence,
    Tuple,
@@ -20,22 +19,16 @@ from sqlalchemy.sql.expression import Select as _Select

 _TSelect = TypeVar("_TSelect")

-class Select(_Select[Tuple[_TSelect]], Generic[_TSelect]):
+class Select(_Select[Tuple[_TSelect]]):
    inherit_cache = True

 # This is not comparable to sqlalchemy.sql.selectable.ScalarSelect, that has a different
 # purpose. This is the same as a normal SQLAlchemy Select class where there's only one
 # entity, so the result will be converted to a scalar by default. This way writing
 # for loops on the results will feel natural.
-class SelectOfScalar(_Select[Tuple[_TSelect]], Generic[_TSelect]):
+class SelectOfScalar(_Select[Tuple[_TSelect]]):
    inherit_cache = True

-# This is not comparable to sqlalchemy.sql.selectable.ScalarSelect, that has a different
-# purpose. This is the same as a normal SQLAlchemy Select class where there's only one
-# entity, so the result will be converted to a scalar by default. This way writing
-# for loops on the results will feel natural.
-class SelectOfScalar(_Select, Generic[_TSelect]):
-    inherit_cache = True

 if TYPE_CHECKING:  # pragma: no cover
    from ..main import SQLModel

diff --git a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial001.py
@@ -174,15 +174,15 @@ def test_tutorial(clear_sqlmodel):
    expected_indexes = [
        {
            "name": "ix_hero_name",
+            "dialect_options": {},
            "column_names": ["name"],
            "unique": 0,
-            "dialect_options": {},
        },
        {
            "name": "ix_hero_age",
+            "dialect_options": {},
            "column_names": ["age"],
            "unique": 0,
-            "dialect_options": {},
        },
    ]
    for index in expected_indexes:

diff --git a/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py b/tests/test_tutorial/test_fastapi/test_multiple_models/test_tutorial002.py
@@ -174,15 +174,15 @@ def test_tutorial(clear_sqlmodel):
    expected_indexes = [
        {
            "name": "ix_hero_age",
+            "dialect_options": {},
            "column_names": ["age"],
            "unique": 0,
-            "dialect_options": {},
        },
        {
            "name": "ix_hero_name",
+            "dialect_options": {},
            "column_names": ["name"],
            "unique": 0,
-            "dialect_options": {},
        },
    ]
    for index in expected_indexes:

diff --git a/tests/test_tutorial/test_indexes/test_tutorial001.py b/tests/test_tutorial/test_indexes/test_tutorial001.py
@@ -27,15 +27,15 @@ def test_tutorial(clear_sqlmodel):
    expected_indexes = [
        {
            "name": "ix_hero_name",
+            "dialect_options": {},
            "column_names": ["name"],
            "unique": 0,
-            "dialect_options": {},
        },
        {
            "name": "ix_hero_age",
+            "dialect_options": {},
            "column_names": ["age"],
            "unique": 0,
-            "dialect_options": {},
        },
    ]
    for index in expected_indexes:

diff --git a/tests/test_tutorial/test_indexes/test_tutorial006.py b/tests/test_tutorial/test_indexes/test_tutorial006.py
@@ -28,15 +28,15 @@ def test_tutorial(clear_sqlmodel):
    expected_indexes = [
        {
            "name": "ix_hero_name",
+            "dialect_options": {},
            "column_names": ["name"],
            "unique": 0,
-            "dialect_options": {},
        },
        {
            "name": "ix_hero_age",
+            "dialect_options": {},
            "column_names": ["age"],
            "unique": 0,
-            "dialect_options": {},
        },
    ]
    for index in expected_indexes: