alternate pip install method

This commit is contained in:
Luke Campagnola 2014-03-25 10:23:10 -04:00
parent bee0bcddfe
commit cf95ccef86

View File

@ -40,13 +40,15 @@ before_install:
install: install:
# Dependencies # Dependencies
- if [ "${PYTHON}" == "2.7" ]; then - if [ "${PYTHON}" == "2.7" ]; then
travis_retry sudo apt-get -qq -y install python-numpy; travis_retry sudo apt-get -qq -y install python-numpy &&
sudo pip install pytest && sudo pip install pytest &&
sudo pip install flake8; sudo pip install flake8;
else else
travis_retry sudo apt-get -qq -y install python3-numpy python3-pip; travis_retry sudo apt-get -qq -y install python3-numpy &&
sudo pip3 install pytest && curl http://python-distribute.org/distribute_setup.py | sudo python3 &&
sudo pip3 install flake8; curl https://raw.github.com/pypa/pip/master/contrib/get-pip.py | sudo python3 &&
sudo pip-3.3 install pytest &&
sudo pip-3.3 install flake8;
fi; fi;
# Qt # Qt
@ -78,16 +80,15 @@ install:
fi; fi;
# Install PyOpenGL # Install PyOpenGL
- if [ "${DEPS}" == "full" ]; then - if [ "${PYTHON}" == "2.7" ]; then
if [ "${PYTHON}" == "2.7" ]; then echo "Using OpenGL stable version (apt)";
echo "Using OpenGL stable version (repos)";
travis_retry sudo apt-get -qq -y install python-opengl; travis_retry sudo apt-get -qq -y install python-opengl;
else else
echo "Using OpenGL stable version (pip)"; echo "Using OpenGL stable version (pip)";
pip install -q PyOpenGL; pip-3.3 install -q PyOpenGL;
fi;
fi; fi;
# Debugging helpers # Debugging helpers
- uname -a - uname -a
- cat /etc/issue - cat /etc/issue