From f19dcbbdc380abbf6f39f19bc1df26c44c2e670a Mon Sep 17 00:00:00 2001 From: Steven Silvester Date: Wed, 3 Dec 2014 20:56:28 -0600 Subject: [PATCH] Clean up use of python version check for pyqt install --- tools/travis_install_optional.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/travis_install_optional.sh b/tools/travis_install_optional.sh index 582503bd..fa4df268 100755 --- a/tools/travis_install_optional.sh +++ b/tools/travis_install_optional.sh @@ -10,8 +10,7 @@ if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then # http://stackoverflow.com/a/9716100 LIBS=( PyQt4 sip.so ) - PYTHON_VERSION=python$(python -c "import sys; print (str(sys.version_info[0])+'.'+str(sys.version_info[1]))") - VAR=( $(which -a $PYTHON_VERSION) ) + VAR=( $(which -a $TRAVIS_PYTHON_VERSION) ) GET_PYTHON_LIB_CMD="from distutils.sysconfig import get_python_lib; print (get_python_lib())" LIB_VIRTUALENV_PATH=$(python -c "$GET_PYTHON_LIB_CMD")