Merge branch 'release/0.24.0'

ri-gilfanov · Jul 15, 2021 · de0446d · de0446d
2 parents 91d7b70 + 6060c1a
commit de0446d
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 75 deletions.
diff --git a/aiohttp_sqlalchemy/__init__.py b/aiohttp_sqlalchemy/__init__.py
@@ -27,19 +27,12 @@
     sa_session_factory,
 )
 from aiohttp_sqlalchemy.views import (
-    SAAbstractView,
     SABaseView,
-    SAInstanceAddMixin,
-    SAInstanceDeleteMixin,
-    SAInstanceEditMixin,
     SAInstanceMixin,
-    SAInstanceView,
-    SAInstanceViewMixin,
     SAItemAddMixin,
     SAItemDeleteMixin,
     SAItemEditMixin,
     SAItemMixin,
-    SAItemView,
     SAItemViewMixin,
     SAListAddMixin,
     SAListDeleteMixin,
@@ -56,7 +49,7 @@
     SAView,
 )
 
-__version__ = '0.23.0'
+__version__ = '0.24.0'
 
 __all__ = [
     'DEFAULT_KEY',
@@ -83,14 +76,8 @@
     'SAListEditMixin',
     'SAListViewMixin',
 
-    'SAInstanceAddMixin',
-    'SAInstanceDeleteMixin',
-    'SAInstanceEditMixin',
     'SAInstanceMixin',
-    'SAInstanceView',
-    'SAInstanceViewMixin',
     'SAItemMixin',
-    'SAItemView',
     'SAMixin',
     'SAModelView',
     'SAPrimaryKeyMixin',
@@ -104,7 +91,6 @@
     'setup',
     # Synonyms
     'DEFAULT_KEY',
-    'SAAbstractView',
     'SAView',
     'sa_bind',
     'sa_init_db',

diff --git a/aiohttp_sqlalchemy/views.py b/aiohttp_sqlalchemy/views.py
@@ -144,16 +144,4 @@ class SAModelView(View, SAModelMixin):
     """SQLAlchemy single model class based view."""
 
 
-class SAInstanceView(View, SAInstanceMixin, metaclass=ABCMeta):
-    """SQLAlchemy single instance class based view."""
-
-
-# Synonyms
-SAAbstractView = SAMixin
-SAItemView = SAInstanceView
-SAOneModelMixin = SAModelMixin
 SAView = SAModelView
-SAInstanceAddMixin = SAItemAddMixin
-SAInstanceDeleteMixin = SAItemDeleteMixin
-SAInstanceEditMixin = SAItemEditMixin
-SAInstanceViewMixin = SAItemViewMixin
diff --git a/docs/reference.rst b/docs/reference.rst
@@ -15,7 +15,7 @@ Class based views
 -----------------
 .. warning::
 
-  API of most view classes module stabilizes to version 1.0.
+  API of most classes of stabilizes to version 1.0.
 
 .. autoclass:: aiohttp_sqlalchemy.SAMixin
   :inherited-members:
@@ -110,10 +110,6 @@ Views
   :members:
   :show-inheritance:
 
-.. autoclass:: aiohttp_sqlalchemy.SAInstanceView
-  :members:
-  :show-inheritance:
-
 Additional functionality
 ------------------------
 .. autofunction:: aiohttp_sqlalchemy.sa_decorator

diff --git a/docs/releases.rst b/docs/releases.rst
@@ -1,6 +1,18 @@
 ========
 Releases
 ========
+Unreleased
+----------
+**Removed**
+* ``SAInstanceView`` class;
+* ``SAItemView`` synonym for ``SAInstanceView``;
+* ``SAAbstractView`` synonym for ``SAMixin``;
+* ``SAOneModelMixin`` synonym for ``SAModelMixin``;
+* ``SAInstanceAddMixin`` synonym for ``SAItemAddMixin``;
+* ``SAInstanceDeleteMixin`` synonym for ``SAItemDeleteMixin``;
+* ``SAInstanceEditMixin`` synonym for ``SAItemEditMixin``;
+* ``SAInstanceViewMixin`` synonym for ``SAItemViewMixin``.
+
 Version 0.23
 ------------
 **Add**

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aiohttp-sqlalchemy"
-version = "0.23.0"
+version = "0.24.0"
 description = "SQLAlchemy 1.4 / 2.0 support for aiohttp."
 authors = [
     "Ruslan Ilyasovich Gilfanov <ri.gilfanov@yandex.ru>",
@@ -35,7 +35,7 @@ repository = "https://github.com/ri-gilfanov/aiohttp-sqlalchemy"
 python = "^3.7"
 aiohttp = "^3.7.4.post0"
 aiohttp-things = ">=0.7.0"
-SQLAlchemy = "^1.4.20"
+SQLAlchemy = "^1.4.21"
 aiomysql = { version = ">=0.0.21", optional = true }
 aiosqlite = { version = ">=0.17.0", optional = true }
 asyncpg = { version = ">=0.23.0", optional = true }
@@ -52,7 +52,7 @@ isort = ">=5.9.2"
 mypy = ">=0.910"
 pytest = ">=6.2.4"
 pytest-cov = ">=2.12.1"
-Sphinx = ">=4.1.0"
+Sphinx = ">=4.1.1"
 sphinx_rtd_theme = ">=0.5.2"
 types-toml = ">=0.1.3"