ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

force pyqt4 install in travis (conda now defaults to pyqt5)

Browse Source
This commit is contained in:
Luke Campagnola 2016-11-01 15:25:54 -07:00
parent 453871564b
commit 04bbbc453a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -17,10 +17,10 @@ env:
# Enable python 2 and python 3 builds # Enable python 2 and python 3 builds
# Note that the 2.6 build doesn't get flake8, and runs old versions of # Note that the 2.6 build doesn't get flake8, and runs old versions of
# Pyglet and GLFW to make sure we deal with those correctly # Pyglet and GLFW to make sure we deal with those correctly
- PYTHON=2.6 QT=pyqt TEST=standard - PYTHON=2.6 QT=pyqt4 TEST=standard
- PYTHON=2.7 QT=pyqt TEST=extra - PYTHON=2.7 QT=pyqt4 TEST=extra
- PYTHON=2.7 QT=pyside TEST=standard - PYTHON=2.7 QT=pyside TEST=standard
- PYTHON=3.4 QT=pyqt TEST=standard - PYTHON=3.4 QT=pyqt5 TEST=standard
# - PYTHON=3.4 QT=pyside TEST=standard # pyside isn't available for 3.4 with conda # - PYTHON=3.4 QT=pyside TEST=standard # pyside isn't available for 3.4 with conda
#- PYTHON=3.2 QT=pyqt5 TEST=standard #- PYTHON=3.2 QT=pyqt5 TEST=standard
@ -56,9 +56,12 @@ install:
- echo ${TEST} - echo ${TEST}
- echo ${PYTHON} - echo ${PYTHON}
- if [ "${QT}" == "pyqt" ]; then - if [ "${QT}" == "pyqt5" ]; then
conda install pyqt --yes; conda install pyqt --yes;
fi; fi;
- if [ "${QT}" == "pyqt4" ]; then
conda install pyqt=4 --yes;
fi;
- if [ "${QT}" == "pyside" ]; then - if [ "${QT}" == "pyside" ]; then
conda install pyside --yes; conda install pyside --yes;
fi; fi;