Merge branch 'development' into windows-support

2019-06-04 22:31:08 +02:00 · 2019-06-04 22:31:08 +02:00 · adf85f7784
parent 29ef88f591 0461adc212
commit adf85f7784
2 changed files with 2 additions and 2 deletions
--- a/setup.py
+++ b/setup.py
@ -102,7 +102,7 @@ setup(
        'nose',
        'scripttest',
        'mock',
-        'hypothesis!=3.56.9',
+        'hypothesis!=3.56.9,<4',
        'flake8'
    ],
    entry_points={
--- a/tox.ini
+++ b/tox.ini
@ -10,7 +10,7 @@ deps = nose
       pytest!=3.2.0,!=3.3.0
       pytest-cov
       pytest-mock
-       hypothesis!=3.56.9
+       hypothesis!=3.56.9,<4
       viivakoodi
 commands = py.test --cov escpos
 passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_*