Merge branch 'development' into windows-support
This commit is contained in:
commit
adf85f7784
2
setup.py
2
setup.py
|
@ -102,7 +102,7 @@ setup(
|
||||||
'nose',
|
'nose',
|
||||||
'scripttest',
|
'scripttest',
|
||||||
'mock',
|
'mock',
|
||||||
'hypothesis!=3.56.9',
|
'hypothesis!=3.56.9,<4',
|
||||||
'flake8'
|
'flake8'
|
||||||
],
|
],
|
||||||
entry_points={
|
entry_points={
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -10,7 +10,7 @@ deps = nose
|
||||||
pytest!=3.2.0,!=3.3.0
|
pytest!=3.2.0,!=3.3.0
|
||||||
pytest-cov
|
pytest-cov
|
||||||
pytest-mock
|
pytest-mock
|
||||||
hypothesis!=3.56.9
|
hypothesis!=3.56.9,<4
|
||||||
viivakoodi
|
viivakoodi
|
||||||
commands = py.test --cov escpos
|
commands = py.test --cov escpos
|
||||||
passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_*
|
passenv = ESCPOS_CAPABILITIES_PICKLE_DIR ESCPOS_CAPABILITIES_FILE CI TRAVIS TRAVIS_* APPVEYOR APPVEYOR_* CODECOV_*
|
||||||
|
|
Loading…
Reference in New Issue