Update scripts for CI.

scripts/bootstrap-env

@@ -79,6 +79,7 @@ if [[ $# -lt $((OPTIND+1)) ]] ; then
     exit 1
 fi
 
+scriptdir=$( normalize "$(dirname "${BASH_SOURCE[0]}")" )
 environment="${*:$OPTIND:1}"
 
 # Our temporary requirements file
@@ -103,7 +104,7 @@ environment=$( normalize "${environment}" )
 
 source "${environment}/bin/activate" || exit 1
 
-echo Installing packages with PIP ...
+echo Installing packages into virtualenv with PIP ...
 if ! "${pip_tool}" install \
                    --disable-pip-version-check \
                    ${quiet:-} \
@@ -116,9 +117,14 @@ echo Checking for any packages that are not in the requirements...
 # The echos in the second argument ensure that PIP and Easy_Install are not removed
 # from the virtualenv.
 to_remove=($(diff <("${pip_tool}" list --disable-pip-version-check | cut -d' ' -f 1 | sort) \
-                  <((echo pip ; echo setuptools; cut -d'=' -f 1 "${tmprequirements}") | sort) \
-                  | grep '^<' \
-                  | cut -d' ' -f2))
+                  <((if [ -e "${scriptdir}/requirements-venv.txt" ] ; then \
+                         cat "${scriptdir}/requirements-venv.txt" ; \
+                     else \
+                         echo pip ; echo setuptools ; \
+                     fi ; \
+                     cut -d'=' -f 1 "${tmprequirements}") | sort) \
+             | grep '^<' \
+             | cut -d' ' -f2))
 if [[ "${#to_remove[@]}" != 0 ]] ; then
     echo "  - removing ${#to_remove[@]} packages"
     if ! "${pip_tool}" uninstall --disable-pip-version-check \

scripts/docs

@@ -10,7 +10,7 @@ ROOT="$SCRIPTS/.."
 # Set up and enter the Virtual env.
 "$SCRIPTS/bootstrap-env" "$ROOT/${VENV_DIR}" \
                          "$ROOT/requirements.txt" \
-                         "$SCRIPTS/requirements-docs.txt"
+                         "$SCRIPTS/requirements-docs.txt" || exit 1
 cd "$ROOT"
 source "${VENV_DIR}/bin/activate" || exit 1
 

scripts/lint

@@ -10,7 +10,7 @@ ROOT="$SCRIPTS/.."
 # Set up and enter the Virtual env.
 "$SCRIPTS/bootstrap-env" "$ROOT/${VENV_DIR}" \
                          "$ROOT/requirements.txt" \
-                         "$SCRIPTS/requirements-lint.txt"
+                         "$SCRIPTS/requirements-lint.txt" || exit 1
 cd "$ROOT"
 source "${VENV_DIR}/bin/activate" || exit 1
 

scripts/requirements-lint.txt

 # Allow our testing
-coverage==4.1
 nose==1.3.7
 psutil==4.3.0
 

scripts/requirements-test.txt

@@ -2,3 +2,4 @@
 coverage==4.1
 nose==1.3.7
 psutil==4.3.0
+

scripts/requirements-venv.txt

+# VirtualEnv requirements
+pip
+setuptools
+wheel
+appdirs
+packaging
+pyparsing
+six

scripts/test

@@ -20,7 +20,7 @@ fi
 # Set up and enter the Virtual env.
 "$SCRIPTS/bootstrap-env" ${PYTHON_SWITCH} "$ROOT/${VENV_DIR}" \
                          "$ROOT/requirements.txt" \
-                         "$SCRIPTS/requirements-test.txt"
+                         "$SCRIPTS/requirements-test.txt" || exit 1
 cd "$ROOT"
 source "${VENV_DIR}/bin/activate" || exit 1