From 81ba8e0525aee28ac60ac5b812736982c4b0e21b Mon Sep 17 00:00:00 2001
From: u214892 <u214892@sbb.ch>
Date: Mon, 3 Jun 2019 14:32:56 +0200
Subject: [PATCH] cleanup continuous integration
---
requirements_continuous_integration.txt | 1 +
requirements_dev.txt | 2 +-
tox.ini | 6 +++---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/requirements_continuous_integration.txt b/requirements_continuous_integration.txt
index 4db5aec..bd06a19 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 6be6181..374c6d9 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 b7696db..1c6a3d4 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}
--
GitLab