Skip to content

P
protobuf
Commit f509c7b2 authored by Jisi Liu's avatar Jisi Liu
Browse files
Options

disable py2.6 tests for json_format_test

parent dbea00ae
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
python/tox.ini
View file @ f509c7b2
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
envlist = envlist =
# cpp implementation on py34 is currently broken due to # cpp implementation on py34 is currently broken due to
# changes introduced by http://bugs.python.org/issue22079. # 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] [testenv]
usedevelop=true usedevelop=true
......
travis.sh
View file @ f509c7b2
...@@ -131,7 +131,8 @@ build_python() { ...@@ -131,7 +131,8 @@ build_python() {
cd python cd python
# Only test Python 2.6/3.x on Linux # Only test Python 2.6/3.x on Linux
if [ $(uname -s) == "Linux" ]; then 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 else
envlist=py27-python envlist=py27-python
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment