From 69aa3fcd405000983baeed76bbfed6163e4ecc97 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Fri, 29 Jan 2021 19:25:17 +0100 Subject: [PATCH] testsuite: Merge python2.6 requirements file We can sepcify the required python version inside the requirements file. --- testsuite/install.sh | 8 +------- testsuite/requirements-26.txt | 9 --------- testsuite/requirements.txt | 9 ++++++--- 3 files changed, 7 insertions(+), 19 deletions(-) delete mode 100644 testsuite/requirements-26.txt diff --git a/testsuite/install.sh b/testsuite/install.sh index e3b1bedc95..d8e5e539e4 100755 --- 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 deleted file mode 100644 index 46e3aeef33..0000000000 --- a/testsuite/requirements-26.txt +++ /dev/null @@ -1,9 +0,0 @@ -lxml<4.3.0 -python-daemon<2.0.0 -argparse -genshi - -nose -mock -pylint<0.29 -pep8 diff --git a/testsuite/requirements.txt b/testsuite/requirements.txt index b4a2dbac3f..87fae5ff07 100644 --- 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'