MNT: dont install pyside for python 3
MNT: 'fi;' ';' ??? !!! remove the 4 threads option from py.test MNT: remove lingering sudo MNT: all the pwd's and ls's MNT: Remove the cd
This commit is contained in:
parent
0b929d3551
commit
c7aa35bab1
32
.travis.yml
32
.travis.yml
@ -51,7 +51,10 @@ install:
|
|||||||
- conda update conda --yes
|
- conda update conda --yes
|
||||||
- conda create -n test_env python=${PYTHON} --yes
|
- conda create -n test_env python=${PYTHON} --yes
|
||||||
- source activate test_env
|
- source activate test_env
|
||||||
- conda install numpy pyopengl pyside pyqt pytest flake8 six --yes
|
- conda install numpy pyopengl pyqt pytest flake8 six --yes
|
||||||
|
- if [${PYTHON} == '2.7']; then
|
||||||
|
conda install pyside --yes;
|
||||||
|
fi;
|
||||||
- pip install pytest-xdist # multi-thread py.test
|
- pip install pytest-xdist # multi-thread py.test
|
||||||
- export PYTEST=py.test;
|
- export PYTEST=py.test;
|
||||||
|
|
||||||
@ -73,7 +76,8 @@ before_script:
|
|||||||
# 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
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
# Help color output from each test
|
# Help color output from each test
|
||||||
- RESET='\033[0m';
|
- RESET='\033[0m';
|
||||||
RED='\033[00;31m';
|
RED='\033[00;31m';
|
||||||
@ -115,18 +119,24 @@ before_script:
|
|||||||
fi;
|
fi;
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
- cd $TRAVIS_DIR
|
#- cd $TRAVIS_DIR
|
||||||
|
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
|
||||||
|
- source activate test_env
|
||||||
|
|
||||||
# Run unit tests
|
# Run unit tests
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- start_test "unit tests";
|
- start_test "unit tests";
|
||||||
PYTHONPATH=. py.test pyqtgraph/ -n 4;
|
PYTHONPATH=. py.test pyqtgraph/;
|
||||||
check_output "unit tests";
|
check_output "unit tests";
|
||||||
|
|
||||||
|
|
||||||
# check line endings
|
# check line endings
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- if [ "${TEST}" == "extra" ]; then
|
- if [ "${TEST}" == "extra" ]; then
|
||||||
start_test "line ending check";
|
start_test "line ending check";
|
||||||
! find ./ -name "*.py" | xargs file | grep CRLF &&
|
! find ./ -name "*.py" | xargs file | grep CRLF &&
|
||||||
@ -135,6 +145,8 @@ script:
|
|||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Check repo size does not expand too much
|
# Check repo size does not expand too much
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- if [ "${TEST}" == "extra" ]; then
|
- if [ "${TEST}" == "extra" ]; then
|
||||||
start_test "repo size check";
|
start_test "repo size check";
|
||||||
echo -e "Estimated content size difference = ${SIZE_DIFF} kB" &&
|
echo -e "Estimated content size difference = ${SIZE_DIFF} kB" &&
|
||||||
@ -143,6 +155,8 @@ script:
|
|||||||
fi;
|
fi;
|
||||||
|
|
||||||
# Check for style issues
|
# Check for style issues
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- if [ "${TEST}" == "extra" ]; then
|
- if [ "${TEST}" == "extra" ]; then
|
||||||
start_test "style check";
|
start_test "style check";
|
||||||
cd ~/repo-clone &&
|
cd ~/repo-clone &&
|
||||||
@ -151,20 +165,26 @@ script:
|
|||||||
check_output "style check";
|
check_output "style check";
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
- cd $TRAVIS_DIR
|
# - cd $TRAVIS_DIR
|
||||||
|
|
||||||
# Check install works
|
# Check install works
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- 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.
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- start_test "double install test";
|
- start_test "double install test";
|
||||||
bash -c "! sudo python${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
|
||||||
|
- pwd
|
||||||
|
- ls
|
||||||
- start_test "import test";
|
- start_test "import test";
|
||||||
echo "import sys; print(sys.path)" | python &&
|
echo "import sys; print(sys.path)" | python &&
|
||||||
cd /; echo "import pyqtgraph.examples" | python;
|
cd /; echo "import pyqtgraph.examples" | python;
|
||||||
|
Loading…
Reference in New Issue
Block a user