Skip to content

Commit

Permalink
Merge branch 'release/0.20.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ri-gilfanov committed Jul 5, 2021
2 parents ff0a994 + 8089815 commit 172c541
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion aiohttp_sqlalchemy/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
SAView,
)

__version__ = '0.20.0'
__version__ = '0.20.1'

__all__ = [
'SA_DEFAULT_KEY',
Expand Down
Empty file added aiohttp_sqlalchemy/py.typed
Empty file.
8 changes: 2 additions & 6 deletions aiohttp_sqlalchemy/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from aiohttp_sqlalchemy.utils import get_session


class SAMixin(ContextMixin, metaclass=ABCMeta): # type: ignore
class SAMixin(ContextMixin, metaclass=ABCMeta):
"""SQLAlchemy class based view mixin."""

sa_session_key: str = SA_DEFAULT_KEY
Expand All @@ -28,11 +28,7 @@ class SAModelMixin(SAMixin, metaclass=ABCMeta):
sa_model: Any = None # Not all developers use declarative mapping


class SAItemMixin(
PrimaryKeyMixin, # type: ignore
SAModelMixin,
metaclass=ABCMeta,
):
class SAItemMixin(PrimaryKeyMixin, SAModelMixin, metaclass=ABCMeta):
"""
SQLAlchemy single instance class based view mixin.
Expand Down
10 changes: 6 additions & 4 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "aiohttp-sqlalchemy"
version = "0.20.0"
version = "0.20.1"
description = "SQLAlchemy 1.4 / 2.0 support for aiohttp."
authors = [
"Ruslan Ilyasovich Gilfanov <ri.gilfanov@yandex.ru>",
Expand All @@ -18,6 +18,7 @@ classifiers = [
"Topic :: Database :: Front-Ends",
"Topic :: Internet",
"Topic :: Internet :: WWW/HTTP",
"Typing :: Typed",
]
keywords = ["aiohttp", "sqlalchemy", "asyncio"]
license = "MIT License"
Expand All @@ -29,7 +30,7 @@ repository = "https://github.com/ri-gilfanov/aiohttp-sqlalchemy"
[tool.poetry.dependencies]
python = "^3.7"
aiohttp = "^3.7.4.post0"
aiohttp-things = ">=0.1.0"
aiohttp-things = ">=0.3.1"
SQLAlchemy = "^1.4.20"
aiomysql = { version = ">=0.0.21", optional = true }
aiosqlite = { version = ">=0.17.0", optional = true }
Expand Down Expand Up @@ -69,5 +70,5 @@ files = [
plugins = "sqlalchemy.ext.mypy.plugin"

[[tool.mypy.overrides]]
module = ['aiohttp_things.*', 'sqlalchemy.*']
module = ['sqlalchemy.*']
ignore_missing_imports = true

0 comments on commit 172c541

Please sign in to comment.