💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiangolo merged 12 commits into from
Aug 24, 2021
Merged

💚 Fix CI installs and tests #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b73d245
💚 Fix Poetry install in CI
tiangolo Aug 24, 2021
53c99ee
💚 Fix coverage report and add lint to CI
tiangolo Aug 24, 2021
5badd61
🎨 Fix type annotations for Session.get
tiangolo Aug 24, 2021
2147d84
➕ Add isort to dev dependencies
tiangolo Aug 24, 2021
bc2c864
🎨 Add type annotations required for Python 3.6
tiangolo Aug 24, 2021
35e8843
🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic
tiangolo Aug 24, 2021
bc332a9
➕ Add development dependencies for Python 3.6
tiangolo Aug 24, 2021
5fb9638
💚 Do not lint in Python 3.6 as Black requires > 3.6
tiangolo Aug 24, 2021
a2b33b3
💚 Use the same pip invocation to call MkDocs
tiangolo Aug 24, 2021
897273d
🔊 Add temporary Tmate for debugging CI
tiangolo Aug 24, 2021
824ace5
💚 Update CI configs, caching and Poetry calls
tiangolo Aug 24, 2021
4a5cda8
💚 Add zip docs utility script
tiangolo Aug 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions .github/workflows/build-docs.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
push:
pull_request:
types: [opened, synchronize]
workflow_dispatch:
inputs:
debug_enabled:
description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
required: false
default: false
jobs:
build-docs:
runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: "3.7"
# Allow debugging with tmate
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
with:
limit-access-to-actor: true
- uses: actions/cache@v2
id: cache
with:
path: ${{ env.pythonLocation }}
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
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 "poetry>=1.2.0a1"
python -m poetry plugin add poetry-version-plugin
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 poetry plugin add poetry-version-plugin
- name: Configure poetry
run: python -m poetry config virtualenvs.in-project true
- name: Ensure cache is healthy
if: steps.cache.outputs.cache-hit == 'true'
run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
run: python -m poetry config virtualenvs.create false
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: python -m poetry install
- name: Install Material for MkDocs Insiders
if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
- name: Build Docs
run: python3.7 -m mkdocs build
run: python -m poetry run mkdocs build
- name: Zip docs
run: bash ./scripts/zip-docs.sh
run: python -m poetry run bash ./scripts/zip-docs.sh
- uses: actions/upload-artifact@v2
with:
name: docs-zip
Expand Down
27 changes: 20 additions & 7 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
release:
types:
- created
workflow_dispatch:
inputs:
debug_enabled:
description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
required: false
default: false

jobs:
publish:
Expand All@@ -14,22 +20,29 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: "3.7"
# Allow debugging with tmate
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
with:
limit-access-to-actor: true
- uses: actions/cache@v2
id: cache
with:
path: ${{ env.pythonLocation }}
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
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 "poetry>=1.2.0a1"
python -m poetry plugin add poetry-version-plugin
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 poetry plugin add poetry-version-plugin
- name: Configure poetry
run: python -m poetry config virtualenvs.in-project true
- name: Ensure cache is healthy
if: steps.cache.outputs.cache-hit == 'true'
run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
run: python -m poetry config virtualenvs.create false
- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: python -m poetry install
Expand Down
32 changes: 24 additions & 8 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
push:
pull_request:
types: [opened, synchronize]
workflow_dispatch:
inputs:
debug_enabled:
description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
required: false
default: false

jobs:
test:
Expand All@@ -19,26 +25,36 @@ jobs:
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
# Allow debugging with tmate
- name: Setup tmate session
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
with:
limit-access-to-actor: true
- uses: actions/cache@v2
id: cache
with:
path: ${{ env.pythonLocation }}
key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
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 "poetry>=1.2.0a1"
python -m poetry plugin add poetry-version-plugin
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 poetry plugin add poetry-version-plugin
- name: Configure poetry
run: python -m poetry config virtualenvs.in-project true
- name: Ensure cache is healthy
if: steps.cache.outputs.cache-hit == 'true'
run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
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' }}
run: python -m poetry run bash scripts/lint.sh
- name: Test
run: bash scripts/test.sh
run: python -m poetry run bash scripts/test.sh
- name: Upload coverage
uses: codecov/codecov-action@v1
3 changes: 3 additions & 0 deletions pyproject.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

[build-system]
requires = ["poetry-core"]
Expand Down
1 change: 1 addition & 0 deletions scripts/test.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml
9 changes: 9 additions & 0 deletions scripts/zip-docs.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
rm -rf docs.zip
fi
zip -r docs.zip ./site
5 changes: 2 additions & 3 deletions sqlmodel/main.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
Callable,
ClassVar,
Dict,
ForwardRef,
List,
Mapping,
Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
)
relationship_to = temp_field.type_
if isinstance(temp_field.type_, ForwardRef):
relationship_to = temp_field.type_.__forward_arg__
relationship_to = temp_field.type_.__forward_arg__ # type: ignore
rel_kwargs: Dict[str, Any] = {}
if rel_info.back_populates:
rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down
6 changes: 3 additions & 3 deletions sqlmodel/orm/session.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

def get(
self,
entity: _T,
entity: Type[_T],
ident: Any,
options: Optional[Sequence[Any]] = None,
populate_existing: bool = False,
with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
identity_token: Optional[Any] = None,
) -> _T:
) -> Optional[_T]:
return super().get(
entity,
ident,
Expand Down
4 changes: 2 additions & 2 deletions sqlmodel/sql/expression.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
pass

class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
pass

class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
pass

# Cast them for editors to work correctly, from several tricks tried, this works
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
💚 Fix CI installs and tests#2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

tiangolo
merged 12 commits into

from

Aug 24, 2021
 Merged


💚 Fix CI installs and tests
#2
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


12 commits


Select commit
Hold shift + click to select a range
b73d245

💚 Fix Poetry install in CI


tiangolo Aug 24, 2021
53c99ee

💚 Fix coverage report and add lint to CI


tiangolo Aug 24, 2021
5badd61

🎨 Fix type annotations for Session.get


tiangolo Aug 24, 2021
2147d84

➕ Add isort to dev dependencies


tiangolo Aug 24, 2021
bc2c864

🎨 Add type annotations required for Python 3.6


tiangolo Aug 24, 2021
35e8843

🐛 Fix ForwardRef handling for Python 3.6, re-use from Pydantic


tiangolo Aug 24, 2021
bc332a9

➕ Add development dependencies for Python 3.6


tiangolo Aug 24, 2021
5fb9638

💚 Do not lint in Python 3.6 as Black requires > 3.6


tiangolo Aug 24, 2021
a2b33b3

💚 Use the same pip invocation to call MkDocs


tiangolo Aug 24, 2021
897273d

🔊 Add temporary Tmate for debugging CI


tiangolo Aug 24, 2021
824ace5

💚 Update CI configs, caching and Poetry calls


tiangolo Aug 24, 2021
4a5cda8

💚 Add zip docs utility script


tiangolo Aug 24, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


33 changes: 23 additions & 10 deletions
.github/workflows/build-docs.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false
jobs:
 build-docs:
 runs-on: ubuntu-20.04
Expand All@@ -16,32 +22,39 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-docs
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
 - name: Install Material for MkDocs Insiders
 if: github.event.pull_request.head.repo.fork == false && steps.cache.outputs.cache-hit != 'true'
 run: pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 run: python -m poetry run pip install git+https://${{ secrets.ACTIONS_TOKEN }}@github.com/squidfunk/mkdocs-material-insiders.git
 - name: Build Docs
 run: python3.7 -m mkdocs build
 run: python -m poetry run mkdocs build
 - name: Zip docs
 run: bash ./scripts/zip-docs.sh
 run: python -m poetry run bash ./scripts/zip-docs.sh
 - uses: actions/upload-artifact@v2
 with:
 name: docs-zip
Expand Down

27 changes: 20 additions & 7 deletions
.github/workflows/publish.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 release:
 types:
 - created
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 publish:
Expand All@@ -14,22 +20,29 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: "3.7"
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 run: python -m poetry config virtualenvs.create false
 - name: Install Dependencies
 if: steps.cache.outputs.cache-hit != 'true'
 run: python -m poetry install
Expand Down

32 changes: 24 additions & 8 deletions
.github/workflows/test.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,12 @@ on:
 push:
 pull_request:
 types: [opened, synchronize]
 workflow_dispatch:
 inputs:
 debug_enabled:
 description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)' 
 required: false
 default: false

jobs:
 test:
Expand All@@ -19,26 +25,36 @@ jobs:
 uses: actions/setup-python@v2
 with:
 python-version: ${{ matrix.python-version }}
 # Allow debugging with tmate
 - name: Setup tmate session
 uses: mxschmitt/action-tmate@v3
 if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled }}
 with:
 limit-access-to-actor: true
 - uses: actions/cache@v2
 id: cache
 with:
 path: ${{ env.pythonLocation }}
 key: ${{ runner.os }}-python-${{ env.pythonLocation }}-${{ hashFiles('pyproject.toml') }}-test
 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 "poetry>=1.2.0a1"
 python -m poetry plugin add poetry-version-plugin 
 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 poetry plugin add poetry-version-plugin
 - name: Configure poetry
 run: python -m poetry config virtualenvs.in-project true
 - name: Ensure cache is healthy
 if: steps.cache.outputs.cache-hit == 'true'
 run: python -m poetry run pip --version >/dev/null 2>&1 || rm -rf .venv
 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' }}
 run: python -m poetry run bash scripts/lint.sh
 - name: Test
 run: bash scripts/test.sh
 run: python -m poetry run bash scripts/test.sh
 - name: Upload coverage
 uses: codecov/codecov-action@v1

3 changes: 3 additions & 0 deletions
pyproject.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,9 @@ coverage = {extras = ["toml"], version = "^5.5"}
fastapi = "^0.68.0"
requests = "^2.26.0"
autoflake = "^1.4"
isort = "^5.9.3"
async_generator = {version = "*", python = "~3.6"}
async-exit-stack = {version = "*", python = "~3.6"}

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

1 change: 1 addition & 0 deletions
scripts/test.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,3 +6,4 @@ set -x
coverage run -m pytest tests
coverage combine
coverage report --show-missing
coverage xml

9 changes: 9 additions & 0 deletions
scripts/zip-docs.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

set -x
set -e

if [ -f docs.zip ]; then
 rm -rf docs.zip
fi
zip -r docs.zip ./site

5 changes: 2 additions & 3 deletions
sqlmodel/main.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,6 @@
 Callable,
 ClassVar,
 Dict,
 ForwardRef,
 List,
 Mapping,
 Optional,
Expand All@@ -30,7 +29,7 @@
from pydantic.fields import FieldInfo as PydanticFieldInfo
from pydantic.fields import ModelField, Undefined, UndefinedType
from pydantic.main import BaseConfig, ModelMetaclass, validate_model
from pydantic.typing import NoArgAnyCallable, resolve_annotations
from pydantic.typing import ForwardRef, NoArgAnyCallable, resolve_annotations
from pydantic.utils import ROOT_KEY, Representation
from sqlalchemy import (
 Boolean,
Expand DownExpand Up@@ -343,7 +342,7 @@ def __init__(
 )
 relationship_to = temp_field.type_
 if isinstance(temp_field.type_, ForwardRef):
 relationship_to = temp_field.type_.__forward_arg__
 relationship_to = temp_field.type_.__forward_arg__ # type: ignore
 rel_kwargs: Dict[str, Any] = {}
 if rel_info.back_populates:
 rel_kwargs["back_populates"] = rel_info.back_populates
Expand Down

6 changes: 3 additions & 3 deletions
sqlmodel/orm/session.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
from typing import Any, Mapping, Optional, Sequence, TypeVar, Union, overload
from typing import Any, Mapping, Optional, Sequence, Type, TypeVar, Union, overload

from sqlalchemy import util
from sqlalchemy.orm import Query as _Query
Expand DownExpand Up@@ -118,13 +118,13 @@ def query(self, *entities: Any, **kwargs: Any) -> "_Query[Any]":

 def get(
 self,
 entity: _T,
 entity: Type[_T],
 ident: Any,
 options: Optional[Sequence[Any]] = None,
 populate_existing: bool = False,
 with_for_update: Optional[Union[Literal[True], Mapping[str, Any]]] = None,
 identity_token: Optional[Any] = None,
 ) -> _T:
 ) -> Optional[_T]:
 return super().get(
 entity,
 ident,
Expand Down

4 changes: 2 additions & 2 deletions
sqlmodel/sql/expression.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -45,10 +45,10 @@ class SelectOfScalar(_Select, Generic[_TSelect]):
 class GenericSelectMeta(GenericMeta, _Select.__class__): # type: ignore
 pass

 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36Select(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta):
 class _Py36SelectOfScalar(_Select, Generic[_TSelect], metaclass=GenericSelectMeta): # type: ignore
 pass

 # Cast them for editors to work correctly, from several tricks tried, this works
Expand Down