Merge remote-tracking branch 'origin/master' into beta-1

1 files changed, 29 insertions, 9 deletions

diff --git a/travis.sh b/travis.sh
index 07004571..a5208fe3 100755
--- a/travis.sh
+++ b/travis.sh
@@ -111,25 +111,45 @@ build_javanano_oracle7() {
   build_javanano
 }
 
+internal_install_python_deps() {
+  sudo pip install tox
+  # Only install Python2.6 on Linux.
+  if [ $(uname -s) == "Linux" ]; then
+    sudo apt-get install -y python-software-properties # for apt-add-repository
+    sudo apt-add-repository -y ppa:fkrull/deadsnakes
+    sudo apt-get update -qq
+    sudo apt-get install -y python2.6 python2.6-dev
+  fi
+}
+
+
 build_python() {
   internal_build_cpp
+  internal_install_python_deps
   cd python
-  python setup.py build
-  python setup.py test
-  python setup.py sdist
-  sudo pip install virtualenv && virtualenv /tmp/protoenv && /tmp/protoenv/bin/pip install dist/*
+  # Only test Python 2.6 on Linux
+  if [ $(uname -s) == "Linux" ]; then
+    envlist=py26-python,py27-python
+  else
+    envlist=py27-python
+  fi
+  tox -e $envlist
   cd ..
 }
 
 build_python_cpp() {
   internal_build_cpp
-  export   LD_LIBRARY_PATH=../src/.libs # for Linux
+  internal_install_python_deps
+  export LD_LIBRARY_PATH=../src/.libs # for Linux
   export DYLD_LIBRARY_PATH=../src/.libs # for OS X
   cd python
-  python setup.py build --cpp_implementation
-  python setup.py test --cpp_implementation
-  python setup.py sdist --cpp_implementation
-  sudo pip install virtualenv && virtualenv /tmp/protoenv && /tmp/protoenv/bin/pip install dist/*
+  # Only test Python 2.6 on Linux
+  if [ $(uname -s) == "Linux" ]; then
+    envlist=py26-cpp,py27-cpp
+  else
+    envlist=py27-cpp
+  fi
+  tox -e $envlist
   cd ..
 }