Browse Source

disable tests for python-cpp under py26 as well.

Jisi Liu 10 years ago
parent
commit
72bd9c959a
2 changed files with 4 additions and 3 deletions
  1. 1 1
      python/tox.ini
  2. 3 2
      travis.sh

+ 1 - 1
python/tox.ini

@@ -2,7 +2,7 @@
 envlist =
 envlist =
     # cpp implementation on py34 is currently broken due to
     # cpp implementation on py34 is currently broken due to
     # changes introduced by http://bugs.python.org/issue22079.
     # changes introduced by http://bugs.python.org/issue22079.
-    # py26 is currently broken due to the json_format_test
+    # py26 is currently broken due to the json_format
     py{27,33,34}-{cpp,python}
     py{27,33,34}-{cpp,python}
 
 
 [testenv]
 [testenv]

+ 3 - 2
travis.sh

@@ -131,7 +131,7 @@ build_python() {
   cd python
   cd python
   # Only test Python 2.6/3.x on Linux
   # Only test Python 2.6/3.x on Linux
   if [ $(uname -s) == "Linux" ]; then
   if [ $(uname -s) == "Linux" ]; then
-    # py26 is currently disabled due to json_format_test
+    # py26 is currently disabled due to json_format
     envlist=py\{27,33,34\}-python
     envlist=py\{27,33,34\}-python
   else
   else
     envlist=py27-python
     envlist=py27-python
@@ -148,7 +148,8 @@ build_python_cpp() {
   cd python
   cd python
   # Only test Python 2.6/3.x on Linux
   # Only test Python 2.6/3.x on Linux
   if [ $(uname -s) == "Linux" ]; then
   if [ $(uname -s) == "Linux" ]; then
-    envlist=py\{26,27,33,34\}-cpp
+    # py26 is currently disabled due to json_format
+    envlist=py\{27,33,34\}-cpp
   else
   else
     envlist=py27-cpp
     envlist=py27-cpp
   fi
   fi