Rationalise installation of pip packages as much as possible

Ensure that unit tests use virtualenv when not in RPM build. Signed-off-by: Mark Syms <mark.syms@citrix.com> Reviewed-by: Chandrika Srinivasan <chandrika.srinivasan@citrix.com>
xapi-project · Mar 19, 2018 · 8112be2 · 8112be2
1 parent 65b5262
commit 8112be2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/base_requirements.txt b/base_requirements.txt
@@ -0,0 +1,6 @@
+mock
+xenapi
+coverage
+astroid==1.4.9
+pylint==1.5
+bitarray
diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -0,0 +1,2 @@
+nose
+-r base_requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -1,7 +1,2 @@
-mock
-xenapi
+-r base_requirements.txt
 coveralls
-coverage
-astroid==1.4.9
-pylint==1.5
-bitarray
diff --git a/tests/run_python_unittests.sh b/tests/run_python_unittests.sh
@@ -4,7 +4,7 @@ set -eu
 
 SMROOT=$(cd $(dirname $0) && cd .. && pwd)
 
-if  [ ! -x "$(command -v nosetests)" ] || [ ! -x "$(command -v coverage)" ]; then
+if  [ ! -v RPM_BUILD_ROOT ]; then
     echo "Activating virtual env"
 
     ENVDIR="$SMROOT/.env"

diff --git a/tests/setup_env_for_python_unittests.sh b/tests/setup_env_for_python_unittests.sh
@@ -15,7 +15,6 @@ pip install six
 pip install packaging
 pip install appdirs
 pip install --upgrade setuptools
-pip install nose
-pip install coverage
-pip install mock==1.0.1
-pip install bitarray
+pip install -r $SMROOT/dev_requirements.txt
+
+