disable py2.6 tests for json_format_test

9 years ago · f509c7b2f5
parent dbea00ae88
commit f509c7b2f5
2 changed files with 4 additions and 2 deletions
--- a/python/tox.ini
+++ b/python/tox.ini
@ -2,7 +2,8 @@
 envlist =
    # cpp implementation on py34 is currently broken due to
    # changes introduced by http://bugs.python.org/issue22079.
-    py{26,27,33,34}-{cpp,python}
+    # py26 is currently broken due to the json_format_test
+    py{27,33,34}-{cpp,python}

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