summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Stufft <donald@stufft.io>2014-04-26 00:56:07 -0400
committerDonald Stufft <donald@stufft.io>2014-04-26 00:56:42 -0400
commit8d9041446f0ad7ad4387fd215860f09be9c6bd44 (patch)
tree8b8fb170d7a8c9d1fc0fb9b914048d6e4cf6c4a7
parent79bda14bed847aa631fbe805a6b956c8539ecead (diff)
downloadpip-8d9041446f0ad7ad4387fd215860f09be9c6bd44.tar.gz
Refactor the Travis running into a shell command
-rw-r--r--.travis.yml2
-rwxr-xr-x.travis/run.sh13
-rw-r--r--tox.ini4
3 files changed, 14 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index c412cb276..fad249573 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ install:
- pip install --upgrade setuptools
- pip install tox
-script: tox
+script: .travis/run.sh
branches:
only:
diff --git a/.travis/run.sh b/.travis/run.sh
new file mode 100755
index 000000000..aef517e35
--- /dev/null
+++ b/.travis/run.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+set -e
+set -x
+
+case $TOXENV in
+ py32)
+ tox
+ ;;
+ *)
+ tox -- -n 8
+ ;;
+esac
diff --git a/tox.ini b/tox.ini
index 0d7478989..6be834b5e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,10 +10,6 @@ deps =
scripttest>=1.3
https://github.com/pypa/virtualenv/archive/develop.zip#egg=virtualenv
commands =
- py.test -n 8 []
-
-[testenv:py32]
-commands =
py.test []
[testenv:docs]