-
-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Docker images for additional travis runs #2368
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
3c7798b
Add prebuilt docker files to travis
wiredfool 94cc72a
disable tests broken on old system versions of numpy/scipy
wiredfool 426f8d6
reenable nightly, move diffcover to non-docker 2.7 build
wiredfool 02e077a
run pep8/pyflakes on all non-docker builds
wiredfool File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| #!/bin/bash | ||
|
|
||
| # gather the coverage data | ||
| sudo apt-get -qq install lcov | ||
| lcov --capture --directory . -b . --output-file coverage.info | ||
| # filter to remove system headers | ||
| lcov --remove coverage.info '/usr/*' -o coverage.filtered.info | ||
| # convert to json | ||
| gem install coveralls-lcov | ||
| coveralls-lcov -v -n coverage.filtered.info > coverage.c.json | ||
|
|
||
| coverage report | ||
| pip install coveralls-merge | ||
| coveralls-merge coverage.c.json | ||
|
|
||
| if [ "$DOCKER" == "" ]; then | ||
| pip install pep8 pyflakes | ||
| pep8 --statistics --count PIL/*.py | ||
| pep8 --statistics --count Tests/*.py | ||
| pyflakes *.py | tee >(wc -l) | ||
| pyflakes PIL/*.py | tee >(wc -l) | ||
| pyflakes Tests/*.py | tee >(wc -l) | ||
| fi | ||
|
|
||
| if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ] && [ "$DOCKER" == "" ]; then | ||
| # Coverage and quality reports on just the latest diff. | ||
| # (Installation is very slow on Py3, so just do it for Py2.) | ||
| depends/diffcover-install.sh | ||
| depends/diffcover-run.sh | ||
| fi | ||
|
|
||
| # after_all | ||
|
|
||
| if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then | ||
| curl -Lo travis_after_all.py https://raw.github.com/dmakhno/travis_after_all/master/travis_after_all.py | ||
| python travis_after_all.py | ||
| export $(cat .to_export_back) | ||
| if [ "$BUILD_LEADER" = "YES" ]; then | ||
| if [ "$BUILD_AGGREGATE_STATUS" = "others_succeeded" ]; then | ||
| echo "All jobs succeded! Triggering macOS build..." | ||
| # Trigger a macOS build at the pillow-wheels repo | ||
| ./build_children.sh | ||
| else | ||
| echo "Some jobs failed" | ||
| fi | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| sudo apt-get update | ||
| sudo apt-get -qq install libfreetype6-dev liblcms2-dev\ | ||
| python-qt4 ghostscript libffi-dev libjpeg-turbo-progs cmake imagemagick | ||
| pip install cffi | ||
| pip install nose | ||
| pip install check-manifest | ||
| pip install olefile | ||
| # Pyroma tests sometimes hang on PyPy; skip | ||
| if [ "$TRAVIS_PYTHON_VERSION" != "pypy" ]; then pip install pyroma; fi | ||
|
|
||
| pip install coverage | ||
|
|
||
| # docs only on python 2.7 | ||
| if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then pip install -r requirements.txt ; fi | ||
|
|
||
| # clean checkout for manifest | ||
| mkdir /tmp/check-manifest && cp -a . /tmp/check-manifest | ||
|
|
||
| # webp | ||
| pushd depends && ./install_webp.sh && popd | ||
|
|
||
| # openjpeg | ||
| pushd depends && ./install_openjpeg.sh && popd | ||
|
|
||
| # libimagequant | ||
| pushd depends && ./install_imagequant.sh && popd | ||
|
|
||
| # extra test images | ||
| pushd depends && ./install_extra_test_images.sh && popd | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #!/bin/bash | ||
|
|
||
| set -e | ||
|
|
||
| coverage erase | ||
| python setup.py clean | ||
| CFLAGS="-coverage" python setup.py build_ext --inplace | ||
|
|
||
| coverage run --append --include=PIL/* selftest.py | ||
| coverage run --append --include=PIL/* -m nose -vx Tests/test_*.py | ||
| pushd /tmp/check-manifest && check-manifest --ignore ".coveragerc,.editorconfig,*.yml,*.yaml,tox.ini" && popd | ||
|
|
||
| # Docs | ||
| if [ "$TRAVIS_PYTHON_VERSION" == "2.7" ]; then make install && make doccheck; fi |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These can give different results for Python 2 and Python 3, and usually take less than 10 seconds. Perhaps keep it for all? Or was it particularly slow for some of the new Dockers?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, I could have sworn that this was in the .travis.yml file that I was pulling from, but I can't find it now, and I've rebased enough that it's lost.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I've just taken these off the dockers. (Note that
TRAVIS_PYTHON_VERSIONin the docker runs is the python version in travis, not in the docker image, so it's pretty much irrelevant at this point, and could fundamentally mismatch)