Updates to CI

.gitignore

@@ -5,4 +5,6 @@ venv
 venv3
 .coverage
 htmlcov
+cover
+coverage.xml
 nosetests.xml

scripts/bootstrap-env

@@ -22,7 +22,7 @@ function normalize() {
 
 function usage() {
     script_name=$(basename "${BASH_SOURCE[0]}")
-    echo "Usage: $script_name [-v] <environment> <requirements>
+    echo "Usage: $script_name [-3] [-v] <environment> <requirements>
 
 Script for configuring and updating a virtualenv based Python environment.
 

scripts/test

@@ -24,12 +24,19 @@ fi
 cd "$ROOT"
 source "${VENV_DIR}/bin/activate" || exit 1
 
+# Clear out any previous coverage data.
+if [ -f .coverage ]; then
+    rm -f .coverage
+fi
+
+
 # Run some rudimentary tests on the code
 echo '>>> Running tests'
 passed=0
 failed=0
 for test in *_test.py ; do
-    if "$PYTHON_TOOL" "$test" -v ; then
+    if "$PYTHON_TOOL" "$test" -v \
+            --with-coverage --cover-branches --cover-html --cover-xml ; then
         passed=$(($passed + 1))
     else
         failed=$(($failed + 1))