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

MNT: Ahh it's the semicolon...

Browse Source
This commit is contained in:
Eric Dill 2015-08-03 17:20:54 -04:00
parent afbc65325e
commit 13c67aff0b
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
.travis.yml
View File

@ -30,7 +30,7 @@ before_install:
- chmod +x miniconda.sh - chmod +x miniconda.sh
- ./miniconda.sh -b -p /home/travis/mc - ./miniconda.sh -b -p /home/travis/mc
- export PATH=/home/travis/mc/bin:$PATH - export PATH=/home/travis/mc/bin:$PATH
# not sure what is if block is for # not sure what is if block is for
- if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then
GIT_TARGET_EXTRA="+refs/heads/${TRAVIS_BRANCH}"; GIT_TARGET_EXTRA="+refs/heads/${TRAVIS_BRANCH}";
@ -55,7 +55,7 @@ install:
- echo ${QT} - echo ${QT}
- echo ${TEST} - echo ${TEST}
- echo ${PYTHON} - echo ${PYTHON}
- if [ "${QT}" == "pyqt" ]; then - if [ "${QT}" == "pyqt" ]; then
conda install pyqt --yes; conda install pyqt --yes;
fi; fi;
@ -64,12 +64,12 @@ install:
fi; fi;
- pip install pytest-xdist # multi-thread py.test - pip install pytest-xdist # multi-thread py.test
- pip install pytest-cov # add coverage stats - pip install pytest-cov # add coverage stats
# required for example testing on python 2.6 # required for example testing on python 2.6
- if [ "${PYTHON}" == "2.6" ]; then - if [ "${PYTHON}" == "2.6" ]; then
pip install importlib pip install importlib;
fi; fi;
# Debugging helpers # Debugging helpers
- uname -a - uname -a
- cat /etc/issue - cat /etc/issue
@ -84,7 +84,7 @@ before_script:
- export DISPLAY=:99.0 - export DISPLAY=:99.0
- "sh -e /etc/init.d/xvfb start" - "sh -e /etc/init.d/xvfb start"
- /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 (this is handled by conda) # Make sure everyone uses the correct python (this is handled by conda)
- which python - which python
- python --version - python --version
@ -132,16 +132,16 @@ before_script:
fi; fi;
script: script:
- source activate test_env - source activate test_env
# Run unit tests # Run unit tests
- start_test "unit tests"; - start_test "unit tests";
PYTHONPATH=. py.test --cov pyqtgraph -n 4 -sv; PYTHONPATH=. py.test --cov pyqtgraph -n 4 -sv;
check_output "unit tests"; check_output "unit tests";
- echo "test script finished. Current directory:" - echo "test script finished. Current directory:"
- pwd - pwd
# check line endings # check line endings
- if [ "${TEST}" == "extra" ]; then - if [ "${TEST}" == "extra" ]; then
start_test "line ending check"; start_test "line ending check";
@ -171,13 +171,13 @@ script:
- start_test "install test"; - start_test "install test";
python setup.py --quiet install; python setup.py --quiet install;
check_output "install test"; check_output "install test";
# 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.
- start_test "double install test"; - start_test "double install test";
bash -c "! python setup.py --quiet install"; bash -c "! python setup.py --quiet install";
check_output "double install test"; check_output "double install test";
# Check we can import pg # Check we can import pg
- start_test "import test"; - start_test "import test";
echo "import sys; print(sys.path)" | python && echo "import sys; print(sys.path)" | python &&