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

Add Qt5 test

Browse Source 
minor fixes
This commit is contained in:
Luke Campagnola 2014-03-24 22:40:18 -04:00
parent 4484efaefe
commit 8d65211ba4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -22,6 +22,7 @@ env:
- PYTHON=2.7 QT=pyside TEST=standard - PYTHON=2.7 QT=pyside TEST=standard
- PYTHON=3.3 QT=pyqt TEST=standard - PYTHON=3.3 QT=pyqt TEST=standard
- PYTHON=3.3 QT=pyside TEST=standard - PYTHON=3.3 QT=pyside TEST=standard
- PYTHON=3.3 QT=pyqt5 TEST=standard
before_install: before_install:
@ -51,8 +52,10 @@ install:
travis_retry sudo apt-get -qq -y install python3-numpy; travis_retry sudo apt-get -qq -y install python3-numpy;
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;
else 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
travis_retry sudo apt-get -qq -y install python3-pyqt5;
fi; fi;
else else
conda create -n testenv --yes --quiet pip python=$PYTHON && conda create -n testenv --yes --quiet pip python=$PYTHON &&
@ -81,6 +84,7 @@ install:
- python${PYTHON} --version - python${PYTHON} --version
- apt-cache search python3-pyqt - apt-cache search python3-pyqt
- apt-cache search python3-pyside - apt-cache search python3-pyside
- apt-cache search pytest
before_script: before_script:
@ -113,9 +117,9 @@ script:
fi; fi;
# Check install works # Check install works
- python setup.py install - python setup.py --quiet install
- cd ..; echo "import pyqtgraph.examples" | python - cd ..; echo "import pyqtgraph.examples" | python
# Check double-install fails # Check double-install fails
- cd pyqtgraph && python setup.py install && if [ $? == 0 ]; then false; else true; fi; - cd pyqtgraph && python setup.py --quiet install; if [ $? == 0 ]; then false; else true; fi;

1
tools/setupHelpers.py
View File

@ -32,6 +32,7 @@ def checkStyle():
def unitTests(): def unitTests():
try: try:
print("version:", sys.version[0])
if sys.version[0] == 3: if sys.version[0] == 3:
out = check_output('PYTHONPATH=. py.test-3', shell=True) out = check_output('PYTHONPATH=. py.test-3', shell=True)
else: else: