Remove tox from dependencies, make build fail on error

jessamynsmith · Apr 24, 2015 · d78ad78 · d78ad78
1 parent 6a7d42a
commit d78ad78
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 19 deletions.
diff --git a/.requirementsrc b/.requirementsrc
@@ -28,7 +28,4 @@ coveralls = 1.0a2
 docopt = 0.6.2
 PyYAML = 3.11
 pipreq = 0.4
-py = 1.4.26
-tox = 1.9.2
-virtualenv = 12.1.1
 
diff --git a/nose_coveralls_flake.sh b/nose_coveralls_flake.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# This script exists because tox only reports errors if a single command is specified
+
+return_code=0
+
+flake8
+return_code=${return_code/#0/$?}
+
+coverage run -m nose
+return_code=${return_code/#0/$?}
+
+coveralls
+return_code=${return_code/#0/$?}
+
+exit $return_code
diff --git a/requirements/development.txt b/requirements/development.txt
@@ -9,7 +9,4 @@ mock==1.0.1
 nose==1.3.6
 pep8==1.5.7
 pipreq==0.4
-py==1.4.26
 pyflakes==0.8.1
-tox==1.9.2
-virtualenv==12.1.1
diff --git a/tox.ini b/tox.ini
@@ -6,19 +6,14 @@
 [tox]
 skipsdist = True
 
-envlist = py26, py27
+envlist = py26, py27, py32, py33, py34
 
 [testenv]
-commands =
-    - flake8
-    - nosetests
-deps = -rrequirements/development.txt
+commands = nosetests
+deps = -rrequirements/package.txt
+    -rrequirements/test.txt
 
-# coveralls has to run inside a virtualenv, after tests, so arbitrarily run
-# it on latest python version
-[testenv:py27]
-commands =
-    - flake8
-    - coverage run -m nose
-    - coveralls
-deps = -rrequirements/development.txt
+[testenv:py34]
+commands = ./nose_coveralls_flake.sh
+deps = -rrequirements/package.txt
+    -rrequirements/test.txt