From 13c67aff0b90348b7d2b74ce8998963e041493cd Mon Sep 17 00:00:00 2001 From: Eric Dill Date: Mon, 3 Aug 2015 17:20:54 -0400 Subject: [PATCH] MNT: Ahh it's the semicolon... --- .travis.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f167791c..e901c7c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ before_install: - chmod +x miniconda.sh - ./miniconda.sh -b -p /home/travis/mc - export PATH=/home/travis/mc/bin:$PATH - + # not sure what is if block is for - if [ "${TRAVIS_PULL_REQUEST}" != "false" ]; then GIT_TARGET_EXTRA="+refs/heads/${TRAVIS_BRANCH}"; @@ -55,7 +55,7 @@ install: - echo ${QT} - echo ${TEST} - echo ${PYTHON} - + - if [ "${QT}" == "pyqt" ]; then conda install pyqt --yes; fi; @@ -64,12 +64,12 @@ install: fi; - pip install pytest-xdist # multi-thread py.test - pip install pytest-cov # add coverage stats - + # required for example testing on python 2.6 - if [ "${PYTHON}" == "2.6" ]; then - pip install importlib + pip install importlib; fi; - + # Debugging helpers - uname -a - cat /etc/issue @@ -84,7 +84,7 @@ before_script: - export DISPLAY=:99.0 - "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 - + # Make sure everyone uses the correct python (this is handled by conda) - which python - python --version @@ -132,16 +132,16 @@ before_script: fi; script: - + - source activate test_env - + # Run unit tests - start_test "unit tests"; PYTHONPATH=. py.test --cov pyqtgraph -n 4 -sv; check_output "unit tests"; - echo "test script finished. Current directory:" - pwd - + # check line endings - if [ "${TEST}" == "extra" ]; then start_test "line ending check"; @@ -171,13 +171,13 @@ script: - start_test "install test"; python setup.py --quiet install; check_output "install test"; - + # Check double-install fails # Note the bash -c is because travis strips off the ! otherwise. - start_test "double install test"; bash -c "! python setup.py --quiet install"; check_output "double install test"; - + # Check we can import pg - start_test "import test"; echo "import sys; print(sys.path)" | python &&