diff options
-rw-r--r-- | python/tox.ini | 3 | ||||
-rwxr-xr-x | travis.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/python/tox.ini b/python/tox.ini index a6352ef4..046cc7cb 100644 --- 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 @@ -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 |