aboutsummaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorJie Luo <jieluo@jieluo-macbookair.roam.corp.google.com>2015-10-09 17:07:03 -0700
committerJie Luo <jieluo@google.com>2015-10-19 16:25:54 -0700
commit2850a98275b1397c511973e207a16ea704ffb18f (patch)
tree0ab2a62841f28774a39f9a240185952b3caf0eea /travis.sh
parent49f24afb45b7add17af3ed4493fa0a94d1cc64da (diff)
downloadprotobuf-2850a98275b1397c511973e207a16ea704ffb18f.tar.gz
protobuf-2850a98275b1397c511973e207a16ea704ffb18f.tar.bz2
protobuf-2850a98275b1397c511973e207a16ea704ffb18f.zip
fix json_format for python2.6:
1, objcect_pair_hook is not supported in python2.6, so duplicated key check is removed in 2.6 2, total_seconds is not suppoted in python2.6, changed to compute seconds directly
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/travis.sh b/travis.sh
index 6b050737..435e7e75 100755
--- a/travis.sh
+++ b/travis.sh
@@ -131,8 +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
- envlist=py\{27,33,34\}-python
+ envlist=py\{26,27,33,34\}-python
else
envlist=py27-python
fi