fully update

mastercoms · mastercoms · commit 3e40ee83efea · 2022-12-20T16:06:16.000+03:30
diff --git a/.github/actions/comment-docs-preview-in-pr/Dockerfile b/.github/actions/comment-docs-preview-in-pr/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 
 RUN pip install httpx "pydantic==1.5.1" pygithub
 
diff --git a/.github/actions/watch-previews/Dockerfile b/.github/actions/watch-previews/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.8
 
 RUN pip install httpx PyGithub "pydantic==1.5.1"
 
diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -37,13 +37,9 @@ jobs:
           key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-root-docs
       - name: Install poetry
         if: steps.cache.outputs.cache-hit != 'true'
-        # TODO: remove python -m pip install --force git+https://github.com/python-poetry/poetry-core.git@ad33bc2
-        # once there's a release of Poetry 1.2.x including poetry-core > 1.1.0a6
-        # Ref: https://github.com/python-poetry/poetry-core/pull/188
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --force git+https://github.com/python-poetry/poetry-core.git@ad33bc2
-          python -m pip install "poetry==1.2.0a2"
+          python -m pip install poetry
           python -m poetry plugin add poetry-version-plugin
       - name: Configure poetry
         run: python -m poetry config virtualenvs.create false
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.7"
+          python-version: "3.8"
       # Allow debugging with tmate
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
@@ -33,13 +33,9 @@ jobs:
           key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-root
       - name: Install poetry
         if: steps.cache.outputs.cache-hit != 'true'
-        # TODO: remove python -m pip install --force git+https://github.com/python-poetry/poetry-core.git@ad33bc2
-        # once there's a release of Poetry 1.2.x including poetry-core > 1.1.0a6
-        # Ref: https://github.com/python-poetry/poetry-core/pull/188
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --force git+https://github.com/python-poetry/poetry-core.git@ad33bc2
-          python -m pip install "poetry==1.2.0a2"
+          python -m pip install poetry
           python -m poetry plugin add poetry-version-plugin
       - name: Configure poetry
         run: python -m poetry config virtualenvs.create false
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -40,21 +40,16 @@ jobs:
           key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-root
       - name: Install poetry
         if: steps.cache.outputs.cache-hit != 'true'
-        # TODO: remove python -m pip install --force git+https://github.com/python-poetry/poetry-core.git@ad33bc2
-        # once there's a release of Poetry 1.2.x including poetry-core > 1.1.0a6
-        # Ref: https://github.com/python-poetry/poetry-core/pull/188
         run: |
           python -m pip install --upgrade pip
-          python -m pip install --force git+https://github.com/python-poetry/poetry-core.git@ad33bc2
-          python -m pip install "poetry==1.2.0a2"
+          python -m pip install poetry
           python -m poetry plugin add poetry-version-plugin
       - name: Configure poetry
         run: python -m poetry config virtualenvs.create false
       - name: Install Dependencies
         if: steps.cache.outputs.cache-hit != 'true'
         run: python -m poetry install
       - name: Lint
-        if: ${{ matrix.python-version != '3.6.15' }}
         run: python -m poetry run bash scripts/lint.sh
       - run: mkdir coverage
       - name: Test
diff --git a/docs/advanced/asyncio.md b/docs/advanced/asyncio.md
@@ -80,12 +80,6 @@ Running an asynchronous function (python3.7+)
 {!./docs_src/advanced/asyncio/tutorial001.py[ln:53-55]!}
 ```
 
-Running an asynchronous function (python3.6)
-
-```Python
-{!./docs_src/advanced/asyncio/tutorial001_py36.py[ln:53-56]!}
-```
-
 Full example.
 
 ```Python
diff --git a/docs/advanced/index.md b/docs/advanced/index.md
@@ -7,10 +7,6 @@ At some point it will include:
 * How to use `async` and `await` with the async session.
 *   See: `docs_src\tutorial_async` for working examples as equivalents to `docs_src\tutorial`
 *   Also see `tests\tutorial_async` for fully functioning pytest tests against the examples
-*   
-*   These examples and tests are also passing `mypy` static checking if #PR58 addressing Issue#54 is included
-*   also note the TODO: for PR#435 subclassing the SQLAlchemey requirements fully into SQLModel
-*   
 * How to run migrations.
 * How to combine **SQLModel** models with SQLAlchemy.
 * ...and more. 🤓
diff --git a/docs/contributing.md b/docs/contributing.md
@@ -8,7 +8,7 @@ If you already cloned the repository and you know that you need to deep dive in
 
 ### Python
 
-SQLModel supports Python 3.8 and above, but for development you should have at least **Python 3.7**.
+SQLModel supports Python 3.8 and above.
 
 ### Poetry
 
diff --git a/docs/tutorial/index.md b/docs/tutorial/index.md
@@ -64,7 +64,7 @@ $ cd sqlmodel-tutorial
 
 Make sure you have an officially supported version of Python.
 
-Currently it is **Python 3.8** and above (Python 3.6 and 3.7 was already deprecated).
+Currently it is **Python 3.8** and above (Python 3.6 and 3.7 were already deprecated).
 
 You can check which version you have with:
 
diff --git a/docs_src/tutorial/code_structure/tutorial001/models.py b/docs_src/tutorial/code_structure/tutorial001/models.py
@@ -1,6 +1,6 @@
-from pydantic import condecimal
 from typing import List, Optional
 
+from pydantic import condecimal
 from sqlmodel import Field, Relationship, SQLModel
 
 
diff --git a/docs_src/tutorial/code_structure/tutorial002/hero_model.py b/docs_src/tutorial/code_structure/tutorial002/hero_model.py
@@ -1,6 +1,6 @@
-from pydantic import condecimal
 from typing import TYPE_CHECKING, Optional
 
+from pydantic import condecimal
 from sqlmodel import Field, Relationship, SQLModel
 
 if TYPE_CHECKING:
diff --git a/docs_src/tutorial_async/connect_async/create_tables_async/tutorial001_async.py b/docs_src/tutorial_async/connect_async/create_tables_async/tutorial001_async.py
@@ -1,11 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel
+from sqlmodel import create_async_engine, Field, SQLModel
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/delete_async/tutorial001_async.py b/docs_src/tutorial_async/connect_async/delete_async/tutorial001_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/insert_async/tutorial001_async.py b/docs_src/tutorial_async/connect_async/insert_async/tutorial001_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/select_async/tutorial001_async.py b/docs_src/tutorial_async/connect_async/select_async/tutorial001_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/select_async/tutorial002_async.py b/docs_src/tutorial_async/connect_async/select_async/tutorial002_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/select_async/tutorial003_async.py b/docs_src/tutorial_async/connect_async/select_async/tutorial003_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/select_async/tutorial004_async.py b/docs_src/tutorial_async/connect_async/select_async/tutorial004_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/select_async/tutorial005_async.py b/docs_src/tutorial_async/connect_async/select_async/tutorial005_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/connect_async/update_async/tutorial001_async.py b/docs_src/tutorial_async/connect_async/update_async/tutorial001_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel
 
 
 class Team(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/select_async/tutorial001_async.py b/docs_src/tutorial_async/select_async/tutorial001_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Hero(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/select_async/tutorial002_async.py b/docs_src/tutorial_async/select_async/tutorial002_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession  # (1)
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Hero(SQLModel, table=True):  # (2)
diff --git a/docs_src/tutorial_async/select_async/tutorial003_async.py b/docs_src/tutorial_async/select_async/tutorial003_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Hero(SQLModel, table=True):
diff --git a/docs_src/tutorial_async/select_async/tutorial004_async.py b/docs_src/tutorial_async/select_async/tutorial004_async.py
@@ -1,12 +1,7 @@
 import asyncio
 from typing import Annotated, Optional
 
-# TODO change when https://github.com/tiangolo/sqlmodel/pull/435 accepted
-# TODO replace following 3 lines with:
-# ------ from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
-from sqlalchemy.ext.asyncio import create_async_engine
-from sqlmodel import Field, SQLModel, select
-from sqlmodel.ext.asyncio.session import AsyncSession
+from sqlmodel import AsyncSession, create_async_engine, Field, SQLModel, select
 
 
 class Hero(SQLModel, table=True):
diff --git a/pyproject.toml b/pyproject.toml
@@ -49,8 +49,6 @@ requests = "^2.28.0"
 httpx = "^0.23.1"
 autoflake = "^2.0.0"
 isort = "^5.11.3"
-async_generator = {version = "*", python = "~3.6"}
-async-exit-stack = {version = "*", python = "~3.6"}
 pytest-asyncio = "^0.19.0"
 SQLAlchemy = {extras = ["asyncio"], version = "^1.4.41"}
 aiosqlite = "^0.17.0"
diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -7,5 +7,3 @@ mypy sqlmodel
 flake8 sqlmodel tests docs_src
 black sqlmodel tests docs_src --check
 isort sqlmodel tests docs_src scripts --check-only
-# TODO: move this to test.sh after deprecating Python 3.6
-CHECK_JINJA=1 python scripts/generate_select.py
diff --git a/scripts/test.sh b/scripts/test.sh
@@ -3,6 +3,7 @@
 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/orm/session.py b/sqlmodel/orm/session.py
@@ -4,11 +4,11 @@
 from sqlalchemy.orm import Query as _Query
 from sqlalchemy.orm import Session as _Session
 from sqlalchemy.sql.base import Executable as _Executable
-from ..sql.expression import Select, SelectOfScalar
 from typing_extensions import Literal
 
 from ..engine.result import Result, ScalarResult
 from ..sql.base import Executable
+from ..sql.expression import Select, SelectOfScalar
 
 _TSelectParam = TypeVar("_TSelectParam")
 
diff --git a/sqlmodel/sql/expression.py b/sqlmodel/sql/expression.py
@@ -24,36 +24,16 @@
 
 _TSelect = TypeVar("_TSelect")
 
-# Workaround Generics incompatibility in Python 3.6
-# Ref: https://github.com/python/typing/issues/449#issuecomment-316061322
-if sys.version_info.minor >= 7:
 
-    class Select(_Select, Generic[_TSelect]):
-        inherit_cache = True
+class Select(_Select, Generic[_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
-
-else:
-    from typing import GenericMeta  # type: ignore
-
-    class GenericSelectMeta(GenericMeta, _Select.__class__):  # type: ignore
-        inherit_cache = True
-
-    class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
-        inherit_cache = True
-
-    class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
-        inherit_cache = True
-
-    # Cast them for editors to work correctly, from several tricks tried, this works
-    # for both VS Code and PyCharm
-    Select = cast("Select", _Py36Select)  # type: ignore
-    SelectOfScalar = cast("SelectOfScalar", _Py36SelectOfScalar)  # type: ignore
+# 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
diff --git a/sqlmodel/sql/expression.py.jinja2 b/sqlmodel/sql/expression.py.jinja2
diff --git a/tests/test_advanced/test_asyncio/test_tutorial001.py b/tests/test_advanced/test_asyncio/test_tutorial001.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.7`
	`1`	`+FROM python:3.8`
`2`	`2`
`3`	`3`	`RUN pip install httpx "pydantic==1.5.1" pygithub`
`4`	`4`