disable tests for python-cpp under py26 as well.

pull/849/head
Jisi Liu 9 years ago
parent f509c7b2f5
commit 72bd9c959a
  1. 2
      python/tox.ini
  2. 5
      travis.sh

@ -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

Loading…
Cancel
Save