(#107) upgrade deps to latest

Author: TTWShell

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "python.pythonPath": "/Users/legolas/.local/share/virtualenvs/hobbit-core-LenoUno4/bin/python"
+}

Pipfile

@@ -6,8 +6,8 @@ name = "pypi"
 [packages]
 tox = "*"
 ipython = "*"
-hobbit-core = {editable = true,extras = ["hobbit", "hobbit_core"],path = "."}
-cx-oracle = "*"
+hobbit-core = {version = "==1.4.4", extras = ["hobbit", "hobbit_core"]}
+cx-Oracle = "*"
 
 [dev-packages]
 sphinx = "==2.0.1"
@@ -20,10 +20,10 @@ pytest-env = "*"
 flake8 = "*"
 twine = "*"
 mypy = "*"
-mypy-extensions = "==0.4.1"
+mypy-extensions = "*"
 
 [requires]
-python_version = "3.7"
+python_version = "3.9"
 
 [pipenv]
 allow_prereleases = true

Pipfile.lock

@@ -6,7 +6,7 @@
 from typing import Any, Union, List, Dict
 
 from flask import current_app
-from sqlalchemy import Integer, Column, ForeignKey, func, DateTime, Sequence
+from sqlalchemy import BigInteger, Column, ForeignKey, func, DateTime, Sequence
 from sqlalchemy.orm.session import Session
 from flask_sqlalchemy import DefaultMeta
 
@@ -15,9 +15,9 @@
 
 class _BaseModel:
 
-    __mapper_args__ = {
-        'order_by': 'id',
-    }
+    # __mapper_args__ = {
+    #     'order_by': 'id',
+    # }
 
     def __repr__(self) -> str:
         """You can set label property.
@@ -35,7 +35,7 @@ class SurrogatePK(_BaseModel):
     """A mixin that add ``id``、``created_at`` and ``updated_at`` columns
     to any declarative-mapped class.
 
-    **id**: A surrogate integer 'primary key' column.
+    **id**: A surrogate biginteger 'primary key' column.
 
     **created_at**: Auto save ``datetime.now()`` when row created.
 
@@ -46,7 +46,7 @@ class SurrogatePK(_BaseModel):
 
     __table_args__ = {'extend_existing': True}  # type: ignore
 
-    id = Column(Integer, primary_key=True)
+    id = Column(BigInteger, primary_key=True)
     created_at = Column(
         DateTime, index=True, nullable=False, server_default=func.now())
     updated_at = Column(
@@ -67,7 +67,7 @@ def __new__(cls, name, bases, attrs):
 
         primary_key_name = attrs.get('primary_key_name') or 'id'
 
-        attrs[primary_key_name] = Column(Integer, primary_key=True)
+        attrs[primary_key_name] = Column(BigInteger, primary_key=True)
         attrs['created_at'] = Column(
             DateTime, index=True, nullable=False, server_default=func.now())
         attrs['updated_at'] = Column(
@@ -80,7 +80,7 @@ def __new__(cls, name, bases, attrs):
             if current_app.config['HOBBIT_UPPER_SEQUENCE_NAME']:
                 sequence_name = sequence_name.upper()
             attrs[primary_key_name] = Column(
-                Integer,
+                BigInteger,
                 Sequence(sequence_name),
                 primary_key=True)
 
@@ -95,7 +95,7 @@ class BaseModel(_BaseModel, db.Model, metaclass=BaseModelMeta):  # type: ignore
     """Abstract base model class contains
     ``id``、``created_at`` and ``updated_at`` columns.
 
-    **id**: A surrogate integer 'primary key' column.
+    **id**: A surrogate biginteger 'primary key' column.
 
     **created_at**: Auto save ``datetime.now()`` when row created.
 
@@ -358,6 +358,7 @@ 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
 

hobbit_core/db.py

@@ -1,12 +1,12 @@
 from marshmallow import (
     Schema as Schema_, fields, pre_load, post_load, post_dump,
 )
-from marshmallow_sqlalchemy.schema import ModelSchemaMeta
-from flask_marshmallow.sqla import ModelSchema as ModelSchema_
+from marshmallow_sqlalchemy.schema import SQLAlchemyAutoSchemaMeta
+from flask_marshmallow.sqla import SQLAlchemyAutoSchema as SQLAlchemyAutoSchema_
 from marshmallow_enum import EnumField
 
 
-class ORMSchema(ModelSchema_):
+class ORMSchema(SQLAlchemyAutoSchema_):
     """Base schema for ModelSchema. See `webargs/issues/126
     <https://github.com/sloria/webargs/issues/126>`_.
 
@@ -92,7 +92,7 @@ class Meta:
         strict = True
 
 
-class EnumSetMeta(ModelSchemaMeta):
+class EnumSetMeta(SQLAlchemyAutoSchemaMeta):
     """EnumSetMeta is a metaclass that can be used to auto generate load and
     dump func for EnumField.
     """
@@ -118,7 +118,7 @@ def wrapper(self, data):
         return wrapper
 
     def __new__(cls, name, bases, attrs):
-        schema = ModelSchemaMeta.__new__(cls, name, tuple(bases), attrs)
+        schema = SQLAlchemyAutoSchemaMeta.__new__(cls, name, tuple(bases), attrs)
         verbose = getattr(schema.Meta, 'verbose', True)
 
         setattr(schema.Meta, 'dateformat', '%Y-%m-%d %H:%M:%S')

hobbit_core/schemas.py

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools", "wheel"]
+build-backend = "setuptools.build_meta:__legacy__"

pyproject.toml

@@ -50,17 +50,17 @@ def gen_data(data_root='static'):
     install_requires=[],
     extras_require={
         'hobbit_core': [
-            'Flask>=1.0.2',
-            'flask-marshmallow>=0.9.0',
-            'Flask-Migrate>=2.2.1',
-            'flask-shell-ipython>=0.3.1',
-            'Flask-SQLAlchemy>=2.3.2',
-            'marshmallow-enum>=1.4.1',
-            'marshmallow-sqlalchemy>=0.14.1',
-            'webargs>=5.1.3, <6',
-            'mypy-extensions==0.4.1',
-            'pyyaml>=4.2b1',
-            'marshmallow==v3.0.0rc6',
+            'Flask>=2.0.1, <3',
+            'flask-marshmallow>=0.14.0, <1',
+            'Flask-Migrate>=3.0.1, <4',
+            'flask-shell-ipython>=0.4.1',
+            'Flask-SQLAlchemy>=2.5.1, <3',
+            'marshmallow-enum>=1.5.1, <2',
+            'marshmallow-sqlalchemy>=0.26.1, <3',
+            'webargs>=8.0.0, <9',
+            'mypy-extensions>=0.4.3',
+            'pyyaml>=5.4.1, <6',
+            'marshmallow>=3.0.0, <4',
         ],
         'hobbit': [
             'Click>=6.7',

setup.py

@@ -22,9 +22,11 @@ def teardown_class(cls):
 
     def teardown_method(self, method):
         with app.app_context():
-            for m in [m for m in db.Model._decl_class_registry.values()
+            print(">>>>>>", [m for m in 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']:
+                print(m)
                 db.session.query(m).delete()
                 db.session.commit()
 

tests/__init__.py

@@ -1,7 +1,7 @@
 import pytest
 from unittest import mock
 
-from webargs.core import Parser, get_value
+from webargs.core import Parser
 
 from .test_app.run import app as tapp
 from .test_app.exts import db as tdb
@@ -62,14 +62,14 @@ def session(request):
 class MockRequestParser(Parser):
     """A minimal parser implementation that parses mock requests."""
 
-    def parse_querystring(self, req, name, field):
-        return get_value(req.query, name, field)
+    def parse_querystring(self, req, schema):
+        return self.load_json(req, schema)
 
-    def parse_json(self, req, name, field):
-        return get_value(req.json, name, field)
+    def parse_json(self, req, schema):
+        return self.load_json(req, schema)
 
-    def parse_cookies(self, req, name, field):
-        return get_value(req.cookies, name, field)
+    def parse_cookies(self, req, schema):
+        return self.load_json(req, schema)
 
 
 @pytest.yield_fixture(scope="function")

tests/conftest.py

@@ -160,6 +160,7 @@ 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() == []