Skip to content

Commit 5826753

Browse files
authored
Merge pull request #103 from TTWShell/fix/deps
fix err when webargs version >= 6.x.x
2 parents 9513425 + 85ee7d3 commit 5826753

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

docs/changelog.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Change history
22
==============
33

4+
1.4.4 (2020-03-25)
5+
6+
* Fix webargs 6.x.x: limit version < 6.
7+
48
1.4.3 (2019-07-24)
59
******************
610

docs/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Hobbit-core中文文档
4141

4242
该命令会生成一个完整的api及其测试范例,使用以下项目启动server::
4343

44+
pipenv shell # 使用虚拟环境
4445
FLASK_APP=app/run.py flask run
4546

4647
你可以在控制台看到类似如下信息::

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ def gen_data(data_root='static'):
3030

3131
setup(
3232
name='hobbit-core',
33-
version='1.4.3',
33+
version='1.4.4',
3434
python_requires='>=3.6, <4',
3535
description='Hobbit - A flask project generator.',
3636
long_description=long_description,
@@ -57,7 +57,7 @@ def gen_data(data_root='static'):
5757
'Flask-SQLAlchemy>=2.3.2',
5858
'marshmallow-enum>=1.4.1',
5959
'marshmallow-sqlalchemy>=0.14.1',
60-
'webargs>=5.1.3',
60+
'webargs>=5.1.3, <6',
6161
'mypy-extensions==0.4.1',
6262
'pyyaml>=4.2b1',
6363
'marshmallow==v3.0.0rc6',

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ envlist = doc,py{36,37}
1313
basepython = python3
1414
changedir = docs
1515
deps =
16-
mypy
16+
mypy==v0.670
1717
sphinx==2.0.1
1818
sphinx-autobuild
1919
flask-sphinx-themes
@@ -25,7 +25,7 @@ extras = hobbit,hobbit_core
2525
deps =
2626
psycopg2-binary
2727
cx-oracle
28-
mypy
28+
mypy==v0.670
2929
pytest
3030
pytest-cov
3131
pytest-env

0 commit comments

Comments
 (0)