Commit 155263c0 authored by Charles Ferguson's avatar Charles Ferguson
Browse files

Updates to CI and some small fixes

parent 49ad8682
...@@ -22,7 +22,7 @@ function normalize() { ...@@ -22,7 +22,7 @@ function normalize() {
function usage() { function usage() {
script_name=$(basename "${BASH_SOURCE[0]}") 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. Script for configuring and updating a virtualenv based Python environment.
......
...@@ -25,7 +25,7 @@ cd "$ROOT" ...@@ -25,7 +25,7 @@ cd "$ROOT"
source "${VENV_DIR}/bin/activate" || exit 1 source "${VENV_DIR}/bin/activate" || exit 1
# Clear out any previous coverage data. # Clear out any previous coverage data.
if [ -d .coverage ]; then if [ -f .coverage ]; then
rm -f .coverage rm -f .coverage
fi fi
......
...@@ -178,7 +178,7 @@ class StreamedInput(object): ...@@ -178,7 +178,7 @@ class StreamedInput(object):
outputfds = [] outputfds = []
exceptfds = [self.proc.stdout] exceptfds = [self.proc.stdout]
while self.proc.poll() is None and not self.stop_issued: while self.proc.poll() is None:
readable, _, exceptional = select.select(inputfds, outputfds, exceptfds) readable, _, exceptional = select.select(inputfds, outputfds, exceptfds)
if readable: if readable:
self._receive_from_subprocess() self._receive_from_subprocess()
......
...@@ -527,4 +527,5 @@ if __name__ == '__main__': ...@@ -527,4 +527,5 @@ if __name__ == '__main__':
__name__ = os.path.basename(sys.argv[0][:-3]) # pylint: disable=redefined-builtin __name__ = os.path.basename(sys.argv[0][:-3]) # pylint: disable=redefined-builtin
env = os.environ env = os.environ
env['NOSE_WITH_XUNIT'] = '1' env['NOSE_WITH_XUNIT'] = '1'
env['NOSE_VERBOSE'] = '1'
exit(nose.runmodule(env=env)) exit(nose.runmodule(env=env))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment