reenable nightly, move diffcover to non-docker 2.7 build

This commit is contained in:
Eric Soroos 2017-01-20 11:34:13 -08:00
parent 94cc72a2ba
commit 426f8d68b1
2 changed files with 8 additions and 7 deletions

View File

@ -8,7 +8,7 @@ notifications:
# Then run the remainder. # Then run the remainder.
matrix: matrix:
fast_finish: false fast_finish: true
allow_failures: allow_failures:
- python: nightly - python: nightly
include: include:
@ -24,6 +24,7 @@ matrix:
- python: '3.5' - python: '3.5'
- python: '3.4' - python: '3.4'
- python: '3.3' - python: '3.3'
- python: 'nightly'
dist: trusty dist: trusty

View File

@ -13,19 +13,19 @@ coverage report
pip install coveralls-merge pip install coveralls-merge
coveralls-merge coverage.c.json coveralls-merge coverage.c.json
if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ] && [ "$DOCKER" == "" ]; then
pip install pep8 pyflakes pip install pep8 pyflakes
pep8 --statistics --count PIL/*.py pep8 --statistics --count PIL/*.py
pep8 --statistics --count Tests/*.py pep8 --statistics --count Tests/*.py
pyflakes *.py | tee >(wc -l) pyflakes *.py | tee >(wc -l)
pyflakes PIL/*.py | tee >(wc -l) pyflakes PIL/*.py | tee >(wc -l)
pyflakes Tests/*.py | tee >(wc -l) pyflakes Tests/*.py | tee >(wc -l)
fi
# Coverage and quality reports on just the latest diff. # Coverage and quality reports on just the latest diff.
# (Installation is very slow on Py3, so just do it for Py2.) # (Installation is very slow on Py3, so just do it for Py2.)
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-install.sh; fi depends/diffcover-install.sh
if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then depends/diffcover-run.sh; fi depends/diffcover-run.sh
fi
# after_all # after_all