Merge pull request #660 from kgriffs/travis_toxenv

chore(tox): Use standard variable to determine tox environment
falconry · Nov 23, 2015 · 4095492 · 4095492
2 parents f172291 + 2d3357b
commit 4095492
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,19 +5,19 @@ cache:
     directories:
         - $HOME/.cache/pip
 env:
-  - TOX_ENV=py26
-  - TOX_ENV=py27
-  - TOX_ENV=py27_cython
-  - TOX_ENV=py33
-  - TOX_ENV=py33_cython
-  - TOX_ENV=py34
-  - TOX_ENV=py34_cython
-  - TOX_ENV=pypy
-  - TOX_ENV=pypy3
-  - TOX_ENV=pep8
-  - TOX_ENV=pylint
-  - TOX_ENV=py27_smoke
-  - TOX_ENV=py27_smoke_cython
+  - TOXENV=py26
+  - TOXENV=py27
+  - TOXENV=py27_cython
+  - TOXENV=py33
+  - TOXENV=py33_cython
+  - TOXENV=py34
+  - TOXENV=py34_cython
+  - TOXENV=pypy
+  - TOXENV=pypy3
+  - TOXENV=pep8
+  - TOXENV=pylint
+  - TOXENV=py27_smoke
+  - TOXENV=py27_smoke_cython
   - JYTHON=true
 
 script: travis_scripts/run_tests.sh

diff --git a/travis_scripts/run_tests.sh b/travis_scripts/run_tests.sh
@@ -4,5 +4,5 @@ if [ "$JYTHON" = "true" ]; then
     # Smoke test
     $HOME/jython/bin/jython falcon/bench/bench.py -t 1 -b falcon falcon-ext
 else
-    tox -e $TOX_ENV
+    tox
 fi