diff options
| -rw-r--r-- | python/tox.ini | 2 | ||||
| -rwxr-xr-x | travis.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/python/tox.ini b/python/tox.ini index 046cc7cb..1c433fa2 100644 --- a/python/tox.ini +++ b/python/tox.ini @@ -2,7 +2,7 @@ envlist = # cpp implementation on py34 is currently broken due to # 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} [testenv] @@ -131,7 +131,7 @@ build_python() { cd python # Only test Python 2.6/3.x on Linux 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 else envlist=py27-python @@ -148,7 +148,8 @@ build_python_cpp() { cd python # Only test Python 2.6/3.x on Linux 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 envlist=py27-cpp fi |