fixed flake8 & rm test for py36

Author: legolas.zhan

.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:

setup.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',

tests/test_db.py

@@ -2,7 +2,7 @@
 import pytest
 import random
 
-from sqlalchemy.exc import ResourceClosedError, InvalidRequestError
+from sqlalchemy.exc import InvalidRequestError
 
 from hobbit_core.db import EnumExt, transaction
 from hobbit_core.db import BaseModel, Column

tests/test_pagination.py

@@ -58,7 +58,7 @@ def test_pagination(self, client):
 
         # test order_by: str
         resp = pagination(User, 1, 10, order_by='role')
-        assert [i.id for i in resp['items']] ==[user1.id, user2.id]
+        assert [i.id for i in resp['items']] == [user1.id, user2.id]
 
         resp = pagination(User, 1, 10, order_by=['role', '-id'])
         assert [i.id for i in resp['items']] == [user2.id, user1.id]