lock SQLAlchemy>=1.3.0, <1.4.0: autobegin lead transaction func not working as excepted

Author: TTWShell

Pipfile

@@ -6,8 +6,8 @@ name = "pypi"
 [packages]
 tox = "*"
 ipython = "*"
-hobbit-core = {version = "==1.4.4", extras = ["hobbit", "hobbit_core"]}
 cx-Oracle = "*"
+zipp = {extras = ["hobbit", "hobbit_core"], path = "."}
 
 [dev-packages]
 sphinx = "==2.0.1"

Pipfile.lock

@@ -24,7 +24,7 @@ class BaseTest:
         pass
 
     def teardown_method(self, method):
-        for m in [m for m in db.Model._decl_class_registry.values()
+        for m in [m for m in db.Model.registry._class_registry.values()
                   if isinstance(m, model.DefaultMeta)]:
             db.session.query(m).delete()
         db.session.commit()

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

@@ -24,7 +24,7 @@ class BaseTest:
         pass
 
     def teardown_method(self, method):
-        for m in [m for m in db.Model._decl_class_registry.values()
+        for m in [m for m in db.Model.registry._class_registry.values()
                   if isinstance(m, model.DefaultMeta)]:
             db.session.query(m).delete()
         db.session.commit()

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

@@ -358,10 +358,8 @@ def create(username, password):
     def wrapper(func):
         @wraps(func)
         def inner(*args, **kwargs):
-            print(session.autocommit, "session.autocommit")
             if session.autocommit is True and nested is False:
                 session.begin()  # start a transaction
-
             try:
                 with session.begin_nested():
                     resp = func(*args, **kwargs)

hobbit_core/db.py

@@ -30,7 +30,7 @@ def gen_data(data_root='static'):
 
 setup(
     name='hobbit-core',
-    version='1.4.4',
+    version='2.0.0.rc1',
     python_requires='>=3.6, <4',
     description='Hobbit - A flask project generator.',
     long_description=long_description,
@@ -54,6 +54,7 @@ def gen_data(data_root='static'):
             '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',
             'marshmallow-enum>=1.5.1, <2',
             'marshmallow-sqlalchemy>=0.26.1, <3',

setup.py

@@ -22,11 +22,10 @@ def teardown_class(cls):
 
     def teardown_method(self, method):
         with app.app_context():
-            print(">>>>>>", [m for m in db.Model.registry._class_registry.values()])
-            for m in [m for m in db.Model.registry._class_registry.values()
+            for m in [m for m in db.Model._decl_class_registry.values()
+                      # db.Model.registry._class_registry.values()
                       if isinstance(m, model.DefaultMeta) and
                       getattr(m, '__bind_key__', None) != 'oracle']:
-                print(m)
                 db.session.query(m).delete()
                 db.session.commit()
 

tests/__init__.py

@@ -30,6 +30,7 @@ def assert_session(app):
         conn = tdb.engine.connect()
         options = dict(bind=conn, binds={})
         sess = tdb.create_scoped_session(options=options)
+        assert sess.autocommit is False
         yield sess
         sess.remove()
 

tests/conftest.py

@@ -160,7 +160,6 @@ def create_user():
             session.commit()
 
         msg = 'This transaction is closed'
-        create_user()
         with pytest.raises(ResourceClosedError, match=msg):
             create_user()
         assert assert_session.query(User).all() == []