allow pytest 4 once again

pull/1012/head
Damon C 2019-05-27 12:05:42 +02:00
parent 42c0c7f662
commit 057b9d638d
3 changed files with 21 additions and 12 deletions

View File

@ -36,8 +36,8 @@ flask-limiter = "*"
[dev-packages]
# Pytest
pytest = "<4"
pytest-xdist = "<1.28"
pytest = "*"
pytest-xdist = "*"
pytest-mypy = "*"
pytest-twisted = "*"
pytest-cov = "*"

22
Pipfile.lock generated
View File

@ -1,7 +1,7 @@
{
"_meta": {
"hash": {
"sha256": "c915ea994d22831bb861ba233a270f22b523e7273935e5f96d48f6634eeaf58a"
"sha256": "9ba934182091c88984a1f7982908630c649e980109eb2393bc7f95246f0e66f7"
},
"pipfile-spec": 6,
"requires": {
@ -1372,6 +1372,7 @@
"sha256:2112d2ca570bb7c3e53ea1a35cd5df42bb0fd10c45f0fb97178679c3c03d64c7",
"sha256:c3e4748ba1aad8dba30a4886b0b1a2004f9a863837b8654e7059eebf727afa5a"
],
"markers": "python_version > '2.7'",
"version": "==7.0.0"
},
"moto": {
@ -1465,11 +1466,11 @@
},
"pytest": {
"hashes": [
"sha256:3f193df1cfe1d1609d4c583838bea3d532b18d6160fd3f55c9447fdca30848ec",
"sha256:e246cf173c01169b9617fc07264b7b1316e78d7a650055235d6d897bc80d9660"
"sha256:1a8aa4fa958f8f451ac5441f3ac130d9fc86ea38780dd2715e6d5c5882700b24",
"sha256:b8bf138592384bd4e87338cb0f256bf5f615398a649d4bd83915f0e4047a5ca6"
],
"index": "pypi",
"version": "==3.10.1"
"version": "==4.5.0"
},
"pytest-cov": {
"hashes": [
@ -1511,11 +1512,11 @@
},
"pytest-xdist": {
"hashes": [
"sha256:a64915be2b23235d6cec0992b8f59b791d64083756fbf13cf574fa5757085bc7",
"sha256:a96ed691705882560fa3fc95531fbd4c224896c827f4004817eb2dcac4ba41a2"
"sha256:b0bb4b0293ee8657b9eb3ff334a3b6aac4db74fd4a86b81e1982c879237a47eb",
"sha256:f83a485293e81fd57c8a5a85a3f12473a532c5ca7dec518857cbb72766bb526c"
],
"index": "pypi",
"version": "==1.27.0"
"version": "==1.28.0"
},
"python-dateutil": {
"hashes": [
@ -1703,6 +1704,13 @@
"markers": "python_version >= '3.4'",
"version": "==1.25.3"
},
"wcwidth": {
"hashes": [
"sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e",
"sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c"
],
"version": "==0.1.7"
},
"websocket-client": {
"hashes": [
"sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9",

View File

@ -40,7 +40,7 @@ jsonpointer==2.0
jsonschema==2.6.0
markupsafe==1.1.1
mock==3.0.5
more-itertools==7.0.0
more-itertools==7.0.0 ; python_version > '2.7'
moto==1.3.8
mypy-extensions==0.4.1
mypy==0.701
@ -56,8 +56,8 @@ pytest-forked==1.0.2
pytest-mock==1.10.4
pytest-mypy==0.3.2
pytest-twisted==1.10
pytest-xdist==1.27.0
pytest==3.10.1
pytest-xdist==1.28.0
pytest==4.5.0
python-dateutil==2.8.0 ; python_version >= '2.7'
python-jose==3.0.1
pytz==2019.1
@ -80,6 +80,7 @@ sphinxcontrib-qthelp==1.0.2
sphinxcontrib-serializinghtml==1.1.3
typed-ast==1.3.5
urllib3==1.25.3 ; python_version >= '3.4'
wcwidth==0.1.7
websocket-client==0.56.0
werkzeug==0.15.4
wrapt==1.11.1