Commit 76f8a3fb authored by Dan O'Reilly's avatar Dan O'Reilly

Travis now only tests Python2.6 on Linux.

Signed-off-by: 's avatarDan O'Reilly <oreilldf@gmail.com>
parent 3791c805
...@@ -113,10 +113,13 @@ build_javanano_oracle7() { ...@@ -113,10 +113,13 @@ build_javanano_oracle7() {
internal_install_python_deps() { internal_install_python_deps() {
sudo pip install tox 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-get install -y python-software-properties # for apt-add-repository
sudo apt-add-repository -y ppa:fkrull/deadsnakes sudo apt-add-repository -y ppa:fkrull/deadsnakes
sudo apt-get update -qq sudo apt-get update -qq
sudo apt-get install -y python2.6 python2.6-dev sudo apt-get install -y python2.6 python2.6-dev
fi
} }
...@@ -124,7 +127,13 @@ build_python() { ...@@ -124,7 +127,13 @@ build_python() {
internal_build_cpp internal_build_cpp
internal_install_python_deps internal_install_python_deps
cd python cd python
tox -e py26-python,py27-python # 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 .. cd ..
} }
...@@ -134,7 +143,13 @@ build_python_cpp() { ...@@ -134,7 +143,13 @@ build_python_cpp() {
export LD_LIBRARY_PATH=../src/.libs # for Linux export LD_LIBRARY_PATH=../src/.libs # for Linux
export DYLD_LIBRARY_PATH=../src/.libs # for OS X export DYLD_LIBRARY_PATH=../src/.libs # for OS X
cd python cd python
tox -e py26-cpp,py27-cpp # 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 .. cd ..
} }
......
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