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

fix py3 tests

Browse Source
This commit is contained in:
Luke Campagnola 2014-03-26 11:13:18 -04:00
parent 426578fa4c
commit 1d30f3c5c7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -20,9 +20,9 @@ env:
#- PYTHON=2.6 QT=pyqt TEST=standard #- PYTHON=2.6 QT=pyqt TEST=standard
- PYTHON=2.7 QT=pyqt TEST=extra - PYTHON=2.7 QT=pyqt TEST=extra
- PYTHON=2.7 QT=pyside TEST=standard - PYTHON=2.7 QT=pyside TEST=standard
- PYTHON=3.3 QT=pyqt TEST=standard - PYTHON=3.2 QT=pyqt TEST=standard
- PYTHON=3.3 QT=pyside TEST=standard - PYTHON=3.2 QT=pyside TEST=standard
- PYTHON=3.3 QT=pyqt5 TEST=standard - PYTHON=3.2 QT=pyqt5 TEST=standard
before_install: before_install:
@ -62,7 +62,7 @@ install:
else else
travis_retry sudo apt-get -qq -y install python-pyside.qtcore python-pyside.qtgui python-pyside.qtsvg python-pyside.qtopengl; travis_retry sudo apt-get -qq -y install python-pyside.qtcore python-pyside.qtgui python-pyside.qtsvg python-pyside.qtopengl;
fi; fi;
elif [ "${PYTHON}" == "3.3" ]; then elif [ "${PYTHON}" == "3.2" ]; then
if [ ${QT} == 'pyqt' ]; then if [ ${QT} == 'pyqt' ]; then
travis_retry sudo apt-get -qq -y install python3-pyqt4; travis_retry sudo apt-get -qq -y install python3-pyqt4;
elif [ ${QT} == 'pyside' ]; then elif [ ${QT} == 'pyside' ]; then
@ -137,11 +137,11 @@ script:
fi; fi;
# Check install works # Check install works
- sudo python setup.py --quiet install - sudo python${PYTHON} setup.py --quiet install
# Check double-install fails # Check double-install fails
# Note the bash -c is because travis strips off the ! otherwise. # Note the bash -c is because travis strips off the ! otherwise.
- bash -c "! sudo python setup.py --quiet install" - bash -c "! sudo python${PYTHON} setup.py --quiet install"
# Check we can import pg # Check we can import pg
- echo "import sys; print(sys.path)" | python - echo "import sys; print(sys.path)" | python