roll back travis support

arskom · Jul 27, 2015 · bce5f17 · bce5f17
1 parent 0d697c3
commit bce5f17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,4 +20,5 @@ script:
   # Python 3 section
   - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then tox -e py33-travis,py33-dj1.7.x,py33-dj1.8.x; fi
   - if [[ $TRAVIS_PYTHON_VERSION == '3.4' ]]; then tox -e py34-travis,py34-dj1.7.x,py34-dj1.8.x; fi
-  - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then tox -e py35-travis,py35-dj1.7.x,py35-dj1.8.x; fi
+  # apparently no 3.5 in travis yet.
+  #- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then tox -e py35-travis,py35-dj1.7.x,py35-dj1.8.x; fi
diff --git a/run_tests.sh b/run_tests.sh
@@ -77,11 +77,11 @@ fi;
 
 # tox compat
 declare -A TOX_ENVS;
-TOX_ENVS["cpy26"]="py26" #,py26-dj1.6.x";
-TOX_ENVS["cpy27"]="py27" #,py27-dj1.6.x,py27-dj1.7.x,py27-dj1.8.x";
-TOX_ENVS["cpy33"]="py33" #,py33-dj1.7.x,py33-dj1.8.x";
-TOX_ENVS["cpy34"]="py34" #,py34-dj1.7.x,py34-dj1.8.x";
-TOX_ENVS["cpy35"]="py35" #,py35-dj1.7.x,py35-dj1.8.x";
+TOX_ENVS["cpy26"]="py26,py26-dj1.6.x";
+TOX_ENVS["cpy27"]="py27,py27-dj1.6.x,py27-dj1.7.x,py27-dj1.8.x";
+TOX_ENVS["cpy33"]="py33,py33-dj1.7.x,py33-dj1.8.x";
+TOX_ENVS["cpy34"]="py34,py34-dj1.7.x,py34-dj1.8.x";
+TOX_ENVS["cpy35"]="py35,py35-dj1.7.x,py35-dj1.8.x";
 
 # Initialization
 IRONPYTHON_URL_BASE=https://github.com/IronLanguages/main/archive;