Merge pull request #36 from TTWShell/release/1.2.5

Release/1.2.5

Author: TTWShell

.circleci/config.yml

@@ -49,7 +49,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: pip install flake8 pytest pytest-cov && pip install --editable .
+          command: pip install flake8 pytest pytest-cov pytest-env && pip install --editable .
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -58,9 +58,6 @@ jobs:
           command: hobbit --echo startproject -n demo -d ~/haha -f --example -p 1024
       - run:
           name: run tests
-          environment:
-            FLASK_APP: app/run.py
-            FLASK_ENV: testing
           command: |
             cd ~/haha
             flask db init && flask db migrate && flask db upgrade
@@ -75,7 +72,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: pip install flake8 pytest pytest-cov && pip install --editable .
+          command: pip install flake8 pytest pytest-cov pytest-env && pip install --editable .
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -90,9 +87,6 @@ jobs:
             tree
       - run:
           name: run tests
-          environment:
-            FLASK_APP: app/run.py
-            FLASK_ENV: testing
           command: |
             cd ~/haha
             flask db init && flask db migrate && flask db upgrade
@@ -107,7 +101,7 @@ jobs:
       - checkout
       - run:
           name: install dependencies
-          command: pip install flake8 pytest pytest-cov && pip install --editable .
+          command: pip install flake8 pytest pytest-cov pytest-env && pip install --editable .
       - run:
           name: use flake8 check self
           command: flake8 .
@@ -124,9 +118,6 @@ jobs:
             tree
       - run:
           name: run tests
-          environment:
-            FLASK_APP: app/run.py
-            FLASK_ENV: testing
           command: |
             cd ~/haha
             flask db init && flask db migrate && flask db upgrade

Pipfile

@@ -14,6 +14,7 @@ flask-sphinx-themes = "*"
 sphinx = "*"
 sphinx-autobuild = "*"
 recommonmark = "*"
+pytest-env = "*"
 
 [dev-packages]
 

Pipfile.lock

@@ -23,7 +23,7 @@ db
 .. automodule:: hobbit_core.flask_hobbit.db
    :members:
    :undoc-members:
-   :exclude-members: SurrogatePK, EnumExt
+   :exclude-members: SurrogatePK, EnumExt, EnumExtMeta
 
    .. autoclass:: SurrogatePK
        :members: __repr__
@@ -49,7 +49,7 @@ schemas
 .. automodule:: hobbit_core.flask_hobbit.schemas
    :members:
    :undoc-members:
-   :exclude-members: ORMSchema, SchemaMixin, PagedSchema
+   :exclude-members: ORMSchema, SchemaMixin, PagedSchema, EnumSetMeta
 
    .. autoclass:: ORMSchema
        :members:

docs/api.rst

@@ -1,19 +1,12 @@
 Change history
 ==============
 
-1.2.5a2 (2018-10-30)
+1.2.5 (2018-10-30)
 
 * Add ModelSchema(Auto generate load and dump func for EnumField).
 * Add logging config file.
-* Fix use_kwargs with fileds.missing=None.
-
-1.2.5a1 (2018-10-25)
-
 * Add EnumExt implementation.
-
-1.2.5a0 (2018-10-22)
-
-* Enhance utils.use_kwargs.
+* Fix use_kwargs with fileds.missing=None and enhanced.
 
 1.2.4 (2018-10-18)
 

docs/changelog.rst

@@ -1 +1 @@
-VERSION = [1, 2, 5, 'a2']
+VERSION = [1, 2, 5]

hobbit_core/__init__.py

@@ -1,5 +1,5 @@
 [pytest]
 env =
-    LASK_APP=app/run.py
+    FLASK_APP=app/run.py
     FLASK_ENV=testing
 addopts = --cov . --cov-report term-missing -s -x -vv -p no:warnings