summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2017-08-17 16:47:33 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2017-08-17 23:03:42 +0200
commit870ce516689f55f20ffd569786951ba0311df88a (patch)
tree27b7a4c372e37ef6fb9e290e837ae1e02fffa49c
parent57e4c9e500b0c1094548d8a16699117cedb07598 (diff)
downloadbcfg2-870ce516689f55f20ffd569786951ba0311df88a.tar.gz
bcfg2-870ce516689f55f20ffd569786951ba0311df88a.tar.bz2
bcfg2-870ce516689f55f20ffd569786951ba0311df88a.zip
testsuite: Requirements for Python3
-rwxr-xr-xtestsuite/install.sh5
-rw-r--r--testsuite/requirements-26.txt9
-rw-r--r--testsuite/requirements.txt9
3 files changed, 17 insertions, 6 deletions
diff --git a/testsuite/install.sh b/testsuite/install.sh
index 1bd214936..b8220d217 100755
--- a/testsuite/install.sh
+++ b/testsuite/install.sh
@@ -13,10 +13,11 @@ else
pip install --no-index --find-links="$HOME/.cache/wheels/" "$@"
}
- pip_wheel -r testsuite/requirements.txt
-
if [[ $PYVER == "2.6" ]]; then
+ pip_wheel -r testsuite/requirements-26.txt
pip_wheel unittest2
+ else
+ pip_wheel -r testsuite/requirements.txt
fi
if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
diff --git a/testsuite/requirements-26.txt b/testsuite/requirements-26.txt
new file mode 100644
index 000000000..f85dc6de4
--- /dev/null
+++ b/testsuite/requirements-26.txt
@@ -0,0 +1,9 @@
+lxml
+python-daemon<2.0.0
+argparse
+genshi
+
+nose
+mock
+pylint<0.29
+pep8
diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt
index 0d8c297aa..80ba8e067 100644
--- a/testsuite/requirements.txt
+++ b/testsuite/requirements.txt
@@ -1,9 +1,10 @@
lxml
+python-daemon
+genshi
+argparse
+
nose
mock
-sphinx<1.5
pylint<0.29
pep8
-python-daemon<2.0.0
-genshi
-argparse
+sphinx<1.5