Merge branch 'development' into feature/clear_content_in_dummy_printer

2017-12-03 23:57:50 +01:00 · 2017-12-03 23:57:50 +01:00 · bd5d49c89c
commit bd5d49c89c
parent 40399c2f9c 01e28bbcf6
2 changed files with 2 additions and 2 deletions
--- a/setup.py
+++ b/setup.py
@ -125,7 +125,7 @@ setup(
    tests_require=[
        'jaconv',
        'tox',
-        'pytest!=3.2.0',
+        'pytest!=3.2.0,!=3.3.0',
        'pytest-cov',
        'pytest-mock',
        'nose',
--- a/tox.ini
+++ b/tox.ini
@ -7,7 +7,7 @@ deps = nose
       coverage
       scripttest
       mock
-       pytest!=3.2.0
+       pytest!=3.2.0,!=3.3.0
       pytest-cov
       pytest-mock
       hypothesis