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

fixes

Browse Source
This commit is contained in:
Luke Campagnola 2014-03-24 23:04:37 -04:00
parent 8d65211ba4
commit 533133905a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -55,7 +55,7 @@ install:
elif [ ${QT} == 'pyside' ]; then elif [ ${QT} == 'pyside' ]; then
travis_retry sudo apt-get -qq -y install python3-pyside; travis_retry sudo apt-get -qq -y install python3-pyside;
else else
travis_retry sudo apt-get -qq -y install python3-pyqt5; pip install PyQt5
fi; fi;
else else
conda create -n testenv --yes --quiet pip python=$PYTHON && conda create -n testenv --yes --quiet pip python=$PYTHON &&
@ -93,8 +93,8 @@ before_script:
- /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render - /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1400x900x24 -ac +extension GLX +render
# Make sure everyone uses the correct python # Make sure everyone uses the correct python
- mkdir ~/bin && ln -s `which python${PYTHON}` ~/bin - mkdir ~/bin && ln -s `which python${PYTHON}` ~/bin/python
- export PATH=~/bin:$PATH - export PATH=/home/travis/bin:$PATH
- which python - which python
- python --version - python --version