testsuite: Merge python2.6 requirements file

We can sepcify the required python version inside the requirements file.
Bcfg2 · Jan 29, 2021 · 69aa3fc · 69aa3fc
1 parent 41a9d42
commit 69aa3fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 19 deletions.
diff --git a/testsuite/install.sh b/testsuite/install.sh
@@ -24,13 +24,7 @@ else
     }
 
     sudo apt-get install -y libxml2-dev libxml2-utils
-    if [[ $PYVER == "2.6" ]]; then
-        pip_wheel -r testsuite/requirements-26.txt
-        pip_wheel unittest2
-    else
-        pip_wheel -r testsuite/requirements.txt
-    fi
-
+    pip_wheel -r testsuite/requirements.txt
 
     if [[ "$WITH_OPTIONAL_DEPS" == "yes" ]]; then
         sudo apt-get install -y libaugeas-dev libacl1-dev libssl-dev

diff --git a/testsuite/requirements-26.txt b/testsuite/requirements-26.txt
diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt
@@ -1,5 +1,7 @@
-lxml
-python-daemon
+lxml<4.3.0 ; python_version<'2.7'
+lxml ; python_version>='2.7
+python-daemon<2.0.0 ; python_version<'2.7'
+python-daemon ; python_version>='2.7'
 genshi
 argparse
 
@@ -8,4 +10,5 @@ mock
 pylint<0.29 ; python_version<'3'
 pylint ; python_version>='3'
 pep8
-sphinx
+sphinx ; python_version>='2.7'
+unittest2 ; python_version<'2.7'