Merge pull request #139 from TTWShell/upgrade/flask-sqlalchemy

Upgrade/flask sqlalchemy

Author: TTWShell

.circleci/config.yml

@@ -31,9 +31,9 @@ jobs:
             tox -- --cov-report=xml
             codecov
 
-  test-py36:
+  test-py310:
     docker:
-      - image: circleci/python:3.6.13
+      - image: circleci/python:3.10.0
         user: root
     working_directory: ~/repo
     steps:
@@ -44,7 +44,6 @@ jobs:
             pip install flake8 pytest pytest-cov pytest-env
             pip install --editable ".[hobbit,hobbit_core]"
             pip install celery
-            pip install "MarkupSafe==2.0.1" blinker[flask]
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -77,7 +76,6 @@ jobs:
             pip install flake8 pytest pytest-cov pytest-env
             pip install --editable ".[hobbit,hobbit_core]"
             pip install celery
-            pip install "MarkupSafe==2.0.1" blinker[flask]
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -113,7 +111,7 @@ workflows:
   test:
     jobs:
       - tox
-      - test-py36:
+      - test-py310:
           requires:
             - tox
       - test-py37:

Pipfile.lock

@@ -27,7 +27,7 @@ class BaseTest:
         exclude_tables = []
         models = {
             m.__tablename__: m
-            for m in db.Model._decl_class_registry.values()
+            for m in db.Model.registry._class_registry.values()
             if isinstance(m, model.DefaultMeta)
         }
         tables = db.metadata.sorted_tables

hobbit/static/bootstrap/rivendell/tests/__init__.py.jinja2

@@ -5,12 +5,12 @@ class TestAPIExample(BaseTest):
 
     def test_ping_api(self, client):
         resp = client.get('/api/ping')
-        assert resp.status_code == 200
+        assert resp.status == 200
 
 
 class TestOption(BaseTest):
 
     def test_options(self, client):
         resp = client.get('/api/options')
-        assert resp.status_code == 200
+        assert resp.status == 200
 

hobbit/static/bootstrap/rivendell/tests/test_tools.py.jinja2

@@ -27,7 +27,7 @@ class BaseTest:
         exclude_tables = []
         models = {
             m.__tablename__: m
-            for m in db.Model._decl_class_registry.values()
+            for m in db.Model.registry._class_registry.values()
             if isinstance(m, model.DefaultMeta)
         }
         tables = db.metadata.sorted_tables

hobbit/static/bootstrap/shire/tests/__init__.py.jinja2

@@ -5,12 +5,12 @@ class TestAPIExample(BaseTest):
 
     def test_ping_api(self, client):
         resp = client.get('/api/ping')
-        assert resp.status_code == 200
+        assert resp.status == 200
 
 
 class TestOption(BaseTest):
 
     def test_options(self, client):
         resp = client.get('/api/options')
-        assert resp.status_code == 200
+        assert resp.status == 200
 

hobbit/static/bootstrap/shire/tests/test_tools.py.jinja2

@@ -15,10 +15,6 @@
 
 class _BaseModel:
 
-    __mapper_args__ = {
-        'order_by': 'id',
-    }
-
     def __repr__(self) -> str:
         """You can set label property.
 
@@ -74,7 +70,7 @@ def __new__(cls, name, bases, attrs):
             DateTime, index=True, nullable=False, server_default=func.now(),
             onupdate=func.now())
 
-        if db.get_engine(bind=attrs.get('__bind_key__')).name == 'oracle':
+        if db.get_engine(bind_key=attrs.get('__bind_key__')).name == 'oracle':
             sequence_name = attrs.get('sequence_name') or \
                 f'{name}_{primary_key_name}_seq'
             if current_app.config['HOBBIT_UPPER_SEQUENCE_NAME']:

hobbit_core/db.py

@@ -35,7 +35,7 @@ def handler_werkzeug_exceptions(cls, e):
             status=e.code)
 
     @classmethod
-    def handler_sqlalchemy_orm_exc(cls, e):
+    def handler_sqlalchemy_exc(cls, e):
         code, message, detail = 500, RESP_MSGS[500], repr(e)
 
         if isinstance(e, orm_exc.NoResultFound):

hobbit_core/err_handler.py

@@ -79,7 +79,8 @@ def pagination(obj: 'model.DefaultMeta', page: int, page_size: int,
                 order_exp.append(getattr(obj, column))
         qexp = qexp.order_by(*order_exp)
 
-    items = qexp.paginate(page, page_size, error_out=False)
+    items = qexp.paginate(page=page, per_page=page_size, error_out=False)
+
     return {
         'items': items.items, 'page': page, 'page_size': page_size,
         'total': items.total,

hobbit_core/pagination.py

@@ -275,7 +275,7 @@ def bulk_create_or_update_on_duplicate(
             if column in item and item[column] is None:
                 item[column] = ''
 
-    engine = db.get_engine(bind=getattr(model_cls, '__bind_key__', None))
+    engine = db.get_engine(bind_key=getattr(model_cls, '__bind_key__', None))
     if engine.name == 'postgresql':
         sql_on_update = ', '.join([
             f' {field} = excluded.{field}'

hobbit_core/utils.py

@@ -26,14 +26,14 @@ def gen_data(data_root='static'):
     import pypandoc
     long_description = pypandoc.convert_file('README.md', 'rst')
     long_description_content_type = 'text/x-rst'
-except(OSError, ImportError):
+except (OSError, ImportError):
     long_description = open('README.md').read()
 
 
 setup(
     name='hobbit-core',
-    version='2.2.3',
-    python_requires='>=3.6, <4',
+    version='3.0.0.rc1',
+    python_requires='>=3.7, <4',
     description='Hobbit - A flask project generator.',
     long_description=long_description,
     long_description_content_type=long_description_content_type,
@@ -42,7 +42,6 @@ def gen_data(data_root='static'):
     url='https://github.com/TTWShell/hobbit-core',
     classifiers=[
         'Topic :: Utilities',
-        'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
@@ -56,12 +55,12 @@ def gen_data(data_root='static'):
     install_requires=[],
     extras_require={
         'hobbit_core': [
-            'Flask>=1.0.0,<2',
+            'Flask>=2.0,<3',
             'flask-marshmallow>=0.14.0,<1',
             'Flask-Migrate>=3.0.1,<4',
             'flask-shell-ipython>=0.4.1',
-            'SQLAlchemy>=1.3.0,< 1.4.0',
-            'Flask-SQLAlchemy>=2.5.1,<3',
+            'SQLAlchemy>=1.4.0,< 2',
+            'Flask-SQLAlchemy>=3.0.0,<4',
             'marshmallow-enum>=1.5.1,<2',
             'marshmallow-sqlalchemy>=0.26.1,<3',
             'webargs>=8.0.0,<9',
@@ -71,8 +70,9 @@ def gen_data(data_root='static'):
         ],
         'hobbit': [
             'Click>=6.7',
-            'Jinja2>=2.10',
+            'Jinja2>=3.0',
             'inflect>=2.1.0',
+            'markupsafe>=2.0.1',
         ],
     },
     entry_points={

setup.py

@@ -13,19 +13,18 @@ class BaseTest(object):
     @classmethod
     def setup_class(cls):
         with app.app_context():
-            db.create_all(bind=None)
-            db.create_all(bind='mysql')
+            db.create_all(bind_key=None)
+            db.create_all(bind_key='mysql')
 
     @classmethod
     def teardown_class(cls):
         with app.app_context():
-            db.drop_all(bind=None)
-            db.drop_all(bind='mysql')
+            db.drop_all(bind_key=None)
+            db.drop_all(bind_key='mysql')
 
     def teardown_method(self, method):
         with app.app_context():
-            for m in [m for m in db.Model._decl_class_registry.values()
-                      # db.Model.registry._class_registry.values()
+            for m in [m for m in db.Model.registry._class_registry.values()
                       if isinstance(m, model.DefaultMeta) and
                       getattr(m, '__bind_key__', None) != 'oracle']:
                 db.session.query(m).delete()

tests/__init__.py

@@ -28,7 +28,7 @@ def assert_session(app):
     with app.app_context():
         conn = tdb.engine.connect()
         options = dict(bind=conn, binds={})
-        sess = tdb.create_scoped_session(options=options)
+        sess = tdb._make_scoped_session(options=options)
         assert sess.autocommit is False
         yield sess
         sess.remove()
@@ -47,7 +47,7 @@ def auto_session(app):
     with app.app_context():
         conn = tdb.engine.connect()
         options = dict(bind=conn, binds={}, autocommit=True)
-        sess = tdb.create_scoped_session(options=options)
+        sess = tdb._make_scoped_session(options=options)
         assert sess.autocommit is True
         yield sess
         sess.remove()

tests/conftest.py

@@ -24,7 +24,9 @@ def signalling(app, changes, **kwargs):
     for instance, operation in changes:
         if instance.__tablename__ in [i.__tablename__ for i in [User]]:
             models_committed.disconnect(signalling)
-            session = db.create_scoped_session()
+            conn = db.engine.connect()
+            options = dict(bind=conn, binds={})
+            session = db._make_scoped_session(options=options)
             user = session.query(User).first()
             if user and user.username == 'signalling_test':
                 user.username = 'signalling_ok'