From 72bd9c959ae309d6b0e1867a0a4f0cd1cc11089b Mon Sep 17 00:00:00 2001 From: Jisi Liu Date: Tue, 6 Oct 2015 10:48:57 -0700 Subject: [PATCH] disable tests for python-cpp under py26 as well. --- python/tox.ini | 2 +- travis.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/python/tox.ini b/python/tox.ini index 046cc7cb42..1c433fa2ce 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] diff --git a/travis.sh b/travis.sh index 9cdf456ec8..6b05073709 100755 --- a/travis.sh +++ b/travis.sh @@ -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