mirror of
https://github.com/wassname/scikit-image.git
synced 2026-08-11 11:25:30 +08:00
Merge pull request #1610 from blink1073/pyqt-test
Reinstate PyQt4 test on Travis
This commit is contained in:
+4
-1
@@ -7,7 +7,9 @@
|
||||
|
||||
language: python
|
||||
sudo: false
|
||||
cache: pip
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.cache/pip
|
||||
addons:
|
||||
apt:
|
||||
packages:
|
||||
@@ -15,6 +17,7 @@ addons:
|
||||
- texlive
|
||||
- texlive-latex-extra
|
||||
- dvipng
|
||||
- python-qt4
|
||||
|
||||
notifications:
|
||||
webhooks:
|
||||
|
||||
+19
-2
@@ -21,8 +21,25 @@ section_end "Flake8.test"
|
||||
section "Install.optional.dependencies"
|
||||
|
||||
# Install Qt and then update the Matplotlib settings
|
||||
retry pip install -q PySide $WHEELHOUSE
|
||||
python ~/venv/bin/pyside_postinstall.py -install
|
||||
if [[ $PY == 2.7* ]]; then
|
||||
# http://stackoverflow.com/a/9716100
|
||||
LIBS=( PyQt4 sip.so )
|
||||
|
||||
VAR=( $(which -a python$PY) )
|
||||
|
||||
GET_PYTHON_LIB_CMD="from distutils.sysconfig import get_python_lib; print (get_python_lib())"
|
||||
LIB_VIRTUALENV_PATH=$(python -c "$GET_PYTHON_LIB_CMD")
|
||||
LIB_SYSTEM_PATH=$(${VAR[-1]} -c "$GET_PYTHON_LIB_CMD")
|
||||
|
||||
for LIB in ${LIBS[@]}
|
||||
do
|
||||
ln -sf $LIB_SYSTEM_PATH/$LIB $LIB_VIRTUALENV_PATH/$LIB
|
||||
done
|
||||
|
||||
else
|
||||
retry pip install -q PySide $WHEELHOUSE
|
||||
python ~/venv/bin/pyside_postinstall.py -install
|
||||
fi
|
||||
|
||||
# Install imread from wheelhouse if available (not 3.2)
|
||||
if [[ $PY != 3.2 ]]; then
|
||||
|
||||
Reference in New Issue
Block a user