Merge branch 'release/0.18.1'

ri-gilfanov · Jun 26, 2021 · 573d9ff · 573d9ff
2 parents 137983f + f4f5511
commit 573d9ff
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/aiohttp_sqlalchemy/__init__.py b/aiohttp_sqlalchemy/__init__.py
@@ -29,10 +29,11 @@
     SABaseView,
     SAMixin,
     SAModelMixin,
+    SAModelView,
     SAView,
 )
 
-__version__ = '0.18.0'
+__version__ = '0.18.1'
 
 __all__ = [
     'SA_DEFAULT_KEY',
@@ -41,7 +42,7 @@
     'SABaseView',
     'SAMixin',
     'SAModelMixin',
-    'SAView',
+    'SAModelView',
     'bind',
     'init_db',
     'sa_decorator',
@@ -52,6 +53,7 @@
     # Synonyms
     'DEFAULT_KEY',
     'SAAbstractView',
+    'SAView',
     'sa_bind',
     'sa_init_db',
 ]

diff --git a/aiohttp_sqlalchemy/views.py b/aiohttp_sqlalchemy/views.py
@@ -32,10 +32,11 @@ class SABaseView(View, SAMixin):
     """SQLAlchemy class based view."""
 
 
-class SAView(View, SAModelMixin):
+class SAModelView(View, SAModelMixin):
     """SQLAlchemy single model class based view."""
 
 
 # Synonyms
 SAAbstractView = SAMixin
 SAOneModelMixin = SAModelMixin
+SAView = SAModelView
diff --git a/docs/advansed.rst b/docs/advansed.rst
@@ -90,14 +90,14 @@ You can apply ``sa_decorator(key)`` with class based views. For example:
 .. code-block:: python
 
   from aiohttp import web
-  from aiohttp_sqlalchemy import SAView, sa_decorator
+  from aiohttp_sqlalchemy import SABaseView, sa_decorator
 
 
   SPECIFIC_DB_KEY = 'sa_specific'
   SPECIFIC_DB_URL = 'sqlite+aiosqlite:///'
 
 
-  class SpecificHandler(SAView):
+  class SpecificHandler(SABaseView):
       @property
       def specific_session(self):
           return self.sa_session(SPECIFIC_DB_KEY)

diff --git a/docs/quickstart.rst b/docs/quickstart.rst
@@ -90,10 +90,10 @@ Class based views
 .. code-block:: python
 
   from aiohttp import web
-  from aiohttp_sqlalchemy import SAView
+  from aiohttp_sqlalchemy import SABaseView
 
 
-  class MyClassBasedView(SAView):
+  class MyClassBasedView(SABaseView):
       async def get(self):
           db_session = self.sa_session()
 

diff --git a/docs/reference.rst b/docs/reference.rst
@@ -16,6 +16,15 @@ Class based views
 .. autoclass:: aiohttp_sqlalchemy.SAMixin
   :members:
 
+.. autoclass:: aiohttp_sqlalchemy.SAModelMixin
+  :members:
+
+.. autoclass:: aiohttp_sqlalchemy.SABaseView
+  :members:
+
+.. autoclass:: aiohttp_sqlalchemy.SAModelView
+  :members:
+
 Additional functionality
 ------------------------
 .. autofunction:: aiohttp_sqlalchemy.sa_decorator

diff --git a/docs/releases.rst b/docs/releases.rst
@@ -1,6 +1,16 @@
 ========
 Releases
 ========
+Version 0.18.1
+--------------
+**Added**
+
+* Synonym ``SAView`` for ``SAModelView``.
+
+**Changed**
+
+* Rename ``SAView`` to ``SAModelView``.
+
 Version 0.18
 ------------
 **Changed**

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aiohttp-sqlalchemy"
-version = "0.18.0"
+version = "0.18.1"
 description = "SQLAlchemy 1.4 / 2.0 support for aiohttp."
 authors = [
     "Ruslan Ilyasovich Gilfanov <ri.gilfanov@yandex.ru>",