diff --git a/requirements_continuous_integration.txt b/requirements_continuous_integration.txt index 4db5aec50c2da1a8a60fd066d8a3fbecb099bbcc..bd06a1994e6f71cb36f5a2137708f439d5c07131 100644 --- a/requirements_continuous_integration.txt +++ b/requirements_continuous_integration.txt @@ -1,3 +1,4 @@ +# contains all additional requirements to run the ```tox .``` in addition to requirements_dev.txt for ```tox -e py37,py37``` bumpversion==0.5.3 wheel==0.32.1 watchdog==0.9.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 6be61810438ff1179d7fb83400326ec386ca6e09..374c6d93a72513b0d470006d199f6b558d298b66 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,4 +1,4 @@ -# contains +# contains all requirements to run the tests by running ```tox -e py36,py37``` tox==3.5.2 twine==1.12.1 pytest==3.8.2 diff --git a/tox.ini b/tox.ini index b7696db66de1638a3d861cd654b9ed9f0a10acdf..1c6a3d45b2ba71dc04d0adb04a1a71b961f38dec 100644 --- a/tox.ini +++ b/tox.ini @@ -56,6 +56,9 @@ passenv = HTTP_PROXY HTTPS_PROXY whitelist_externals = sh +deps = + -r{toxinidir}/requirements_dev.txt + -r{toxinidir}/requirements_continuous_integration.txt commands = sh -c 'ls benchmarks/*.py | xargs -n 1 python' @@ -71,9 +74,6 @@ passenv = HTTPS_PROXY deps = -r{toxinidir}/requirements_dev.txt -; If you want to make tox run the tests with the same versions, create a -; requirements.txt with the pinned versions and uncomment the following line: -; -r{toxinidir}/requirements.txt commands = sh -c 'echo DISPLAY: $DISPLAY' py.test --basetemp={envtmpdir}