From d3702fd6143d3739e6d7725ca8cf82650e048942 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sat, 21 Nov 2020 13:43:44 +0200 Subject: [PATCH 1/5] Remove unused Travis CI config --- .ci/after_success.sh | 6 ------ .ci/install.sh | 6 +----- .ci/test.sh | 5 ----- depends/diffcover-install.sh | 8 -------- depends/diffcover-run.sh | 5 ----- requirements.txt | 2 -- 6 files changed, 1 insertion(+), 31 deletions(-) delete mode 100755 depends/diffcover-install.sh delete mode 100755 depends/diffcover-run.sh diff --git a/.ci/after_success.sh b/.ci/after_success.sh index 762670f101c..01889607beb 100755 --- a/.ci/after_success.sh +++ b/.ci/after_success.sh @@ -11,9 +11,3 @@ fi if [[ $TRAVIS ]]; then codecov --flags TravisCI fi - -if [ "$TRAVIS_PYTHON_VERSION" == "3.9" ]; then - # Coverage and quality reports on just the latest diff. - depends/diffcover-install.sh - depends/diffcover-run.sh -fi diff --git a/.ci/install.sh b/.ci/install.sh index db259bdca12..3e1d64e34e4 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -34,10 +34,9 @@ python3 -m pip install test-image-results # TODO Remove condition when numpy supports 3.10 if ! [ "$GHA_PYTHON_VERSION" == "3.10-dev" ]; then python3 -m pip install numpy ; fi -# TODO Remove when 3.8 / 3.9 / PyPy3 includes setuptools 49.3.2+: +# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+: if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi -if [ "$TRAVIS_PYTHON_VERSION" == "pypy3.6-7.3.1" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi # PyQt5 doesn't support PyPy3 # Wheel doesn't yet support 3.10 @@ -48,9 +47,6 @@ if [[ $GHA_PYTHON_VERSION == 3.* && $GHA_PYTHON_VERSION != "3.10-dev" ]]; then python3 -m pip install pyqt5 fi -# docs only on Python 3.9 -if [ "$TRAVIS_PYTHON_VERSION" == "3.9" ]; then python3 -m pip install -r requirements.txt ; fi - # webp pushd depends && ./install_webp.sh && popd diff --git a/.ci/test.sh b/.ci/test.sh index 1396445e0a4..5a19ec9b42c 100755 --- a/.ci/test.sh +++ b/.ci/test.sh @@ -3,8 +3,3 @@ set -e python -bb -m pytest -v -x -W always --cov PIL --cov Tests --cov-report term Tests - -# Docs -if [ "$TRAVIS_PYTHON_VERSION" == "3.9" ] && [ "$TRAVIS_CPU_ARCH" == "amd64" ]; then - make doccheck -fi diff --git a/depends/diffcover-install.sh b/depends/diffcover-install.sh deleted file mode 100755 index 18be4f9f9d1..00000000000 --- a/depends/diffcover-install.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# Fetch the remote master branch before running diff-cover on Travis CI. -# https://github.com/Bachmann1234/diff-cover#troubleshooting -git fetch origin master:refs/remotes/origin/master - -# CFLAGS=-O0 means build with no optimisation. -# Makes build much quicker for lxml and other dependencies. -time CFLAGS=-O0 python3 -m pip install diff_cover diff --git a/depends/diffcover-run.sh b/depends/diffcover-run.sh deleted file mode 100755 index b007494e922..00000000000 --- a/depends/diffcover-run.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env bash -coverage xml -diff-cover coverage.xml -diff-quality --violation=pyflakes -diff-quality --violation=pycodestyle diff --git a/requirements.txt b/requirements.txt index 9758f91fd86..ea57e863bad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,6 @@ check-manifest coverage jarn.viewdoc olefile -pycodestyle -pyflakes pyroma pytest pytest-cov From 9e21ef7338cdf5e09aab3dcadea80988863c931d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Mon, 14 Dec 2020 20:35:04 +0200 Subject: [PATCH 2/5] Remove old Travis CI config --- .ci/after_success.sh | 4 ---- .ci/install.sh | 2 -- .github/CONTRIBUTING.md | 4 ++-- .github/mergify.yml | 1 - README.md | 15 ++++++--------- RELEASING.md | 4 ++-- Tests/bench_cffi_access.py | 2 +- depends/README.rst | 4 ++-- docs/about.rst | 6 +++--- docs/index.rst | 20 ++++++++------------ 10 files changed, 24 insertions(+), 38 deletions(-) diff --git a/.ci/after_success.sh b/.ci/after_success.sh index 01889607beb..ff91b481eca 100755 --- a/.ci/after_success.sh +++ b/.ci/after_success.sh @@ -7,7 +7,3 @@ if [[ $MATRIX_DOCKER ]]; then else coverage xml fi - -if [[ $TRAVIS ]]; then - codecov --flags TravisCI -fi diff --git a/.ci/install.sh b/.ci/install.sh index 3e1d64e34e4..9372d0c515d 100755 --- a/.ci/install.sh +++ b/.ci/install.sh @@ -21,8 +21,6 @@ sudo apt-get -qq install libfreetype6-dev liblcms2-dev python3-tk\ ghostscript libffi-dev libjpeg-turbo-progs libopenjp2-7-dev\ cmake imagemagick libharfbuzz-dev libfribidi-dev -if [[ $TRAVIS_CPU_ARCH == "s390x" ]]; then sudo chown $USER ~/.cache/pip/wheels ; fi - python3 -m pip install --upgrade pip PYTHONOPTIMIZE=0 python3 -m pip install cffi python3 -m pip install coverage diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a65487d5ea5..e20296da5a7 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,7 +9,7 @@ Please send a pull request to the master branch. Please include [documentation]( - Fork the Pillow repository. - Create a branch from master. - Develop bug fixes, features, tests, etc. -- Run the test suite. You can enable [Travis CI](https://travis-ci.com/account/repositories) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests. +- Run the test suite. You can enable [GitHub Actions](http://github.com/MY-USERNAME/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests. - Create a pull request to pull the changes from your branch to the Pillow master. ### Guidelines @@ -17,7 +17,7 @@ Please send a pull request to the master branch. Please include [documentation]( - Separate code commits from reformatting commits. - Provide tests for any newly added code. - Follow PEP 8. -- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on Travis CI and AppVeyor. +- When committing only documentation changes please include `[ci skip]` in the commit message to avoid running tests on AppVeyor. ## Reporting Issues diff --git a/.github/mergify.yml b/.github/mergify.yml index b37db48d48a..4b8b113d3e4 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -7,7 +7,6 @@ pull_request_rules: - status-success=Test Successful - status-success=Docker Test Successful - status-success=Windows Test Successful -# - status-success=Travis CI - Pull Request - status-success=continuous-integration/appveyor/pr actions: merge: diff --git a/README.md b/README.md index 6c323413dec..0408f4c2816 100644 --- a/README.md +++ b/README.md @@ -24,15 +24,6 @@ As of 2019, Pillow development is tests - Travis CI build status (Linux) - Travis CI build status (macOS) - AppVeyor CI build status (Windows) GitHub Actions build status (Lint) @@ -45,6 +36,12 @@ As of 2019, Pillow development is GitHub Actions build status (Test Docker) + AppVeyor CI build status (Windows) + Travis CI build status (macOS) Code coverage diff --git a/RELEASING.md b/RELEASING.md index 5e00e57242f..b3845d09051 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -6,7 +6,7 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. * [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154 * [ ] Develop and prepare release in `master` branch. -* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions), [Travis CI](https://travis-ci.com/github/python-pillow/Pillow) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `master` branch. +* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `master` branch. * [ ] Check that all of the wheel builds [Pillow Wheel Builder](https://github.com/python-pillow/pillow-wheels) pass the tests in Travis CI. * [ ] In compliance with [PEP 440](https://www.python.org/dev/peps/pep-0440/), update version identifier in `src/PIL/_version.py` * [ ] Update `CHANGES.rst`. @@ -41,7 +41,7 @@ Released as needed for security, installation or critical bug fixes. -* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions), [Travis CI](https://travis-ci.com/github/python-pillow/Pillow) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in release branch e.g. `5.2.x`. +* [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in release branch e.g. `5.2.x`. * [ ] In compliance with [PEP 440](https://www.python.org/dev/peps/pep-0440/), update version identifier in `src/PIL/_version.py` * [ ] Run pre-release check via `make release-test`. * [ ] Create tag for release e.g.: diff --git a/Tests/bench_cffi_access.py b/Tests/bench_cffi_access.py index f9edcf09ae4..87cad699d3b 100644 --- a/Tests/bench_cffi_access.py +++ b/Tests/bench_cffi_access.py @@ -4,7 +4,7 @@ from .helper import hopper -# Not running this test by default. No DOS against Travis CI. +# Not running this test by default. No DOS against CI. def iterate_get(size, access): diff --git a/depends/README.rst b/depends/README.rst index ce88fa47ba2..b69c9dcbf8f 100644 --- a/depends/README.rst +++ b/depends/README.rst @@ -3,7 +3,7 @@ Depends ``install_openjpeg.sh``, ``install_webp.sh``, ``install_imagequant.sh``, ``install_raqm.sh`` and ``install_raqm_cmake.sh`` can be used to download, -build & install non-packaged dependencies; useful for testing with Travis CI. +build & install non-packaged dependencies; useful for testing on CI. ``install_extra_test_images.sh`` can be used to install additional test images -that are used for Travis CI and AppVeyor. +that are used by CI. diff --git a/docs/about.rst b/docs/about.rst index acd361fa844..51b583ea0e2 100644 --- a/docs/about.rst +++ b/docs/about.rst @@ -6,13 +6,13 @@ Goals The fork author's goal is to foster and support active development of PIL through: -- Continuous integration testing via `Travis CI`_, `AppVeyor`_ and `GitHub Actions`_ +- Continuous integration testing via `GitHub Actions`_, `AppVeyor`_ and `Travis CI`_ - Publicized development activity on `GitHub`_ - Regular releases to the `Python Package Index`_ -.. _Travis CI: https://travis-ci.com/github/python-pillow/Pillow -.. _AppVeyor: https://ci.appveyor.com/project/Python-pillow/pillow .. _GitHub Actions: https://github.com/python-pillow/Pillow/actions +.. _AppVeyor: https://ci.appveyor.com/project/Python-pillow/pillow +.. _Travis CI: https://travis-ci.com/github/python-pillow/pillow-wheels .. _GitHub: https://github.com/python-pillow/Pillow .. _Python Package Index: https://pypi.org/project/Pillow/ diff --git a/docs/index.rst b/docs/index.rst index eafcb1fec60..d2aca4bc4bb 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -9,18 +9,6 @@ Pillow for enterprise is available via the Tidelift Subscription. `Learn more Date: Fri, 18 Dec 2020 18:51:13 +1100 Subject: [PATCH 3/5] GitHub Actions have been added to wheels [ci skip] --- RELEASING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index b3845d09051..db7b2244581 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -7,7 +7,7 @@ Released quarterly on January 2nd, April 1st, July 1st and October 15th. * [ ] Open a release ticket e.g. https://github.com/python-pillow/Pillow/issues/3154 * [ ] Develop and prepare release in `master` branch. * [ ] Check [GitHub Actions](https://github.com/python-pillow/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/project/python-pillow/Pillow) to confirm passing tests in `master` branch. -* [ ] Check that all of the wheel builds [Pillow Wheel Builder](https://github.com/python-pillow/pillow-wheels) pass the tests in Travis CI. +* [ ] Check that all of the wheel builds [Pillow Wheel Builder](https://github.com/python-pillow/pillow-wheels) pass the tests in Travis CI and GitHub Actions. * [ ] In compliance with [PEP 440](https://www.python.org/dev/peps/pep-0440/), update version identifier in `src/PIL/_version.py` * [ ] Update `CHANGES.rst`. * [ ] Run pre-release check via `make release-test` in a freshly cloned repo. From b0af0d4076a47ae9612c0d8e946e9ae14e9c4aef Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 18 Dec 2020 19:27:22 +1100 Subject: [PATCH 4/5] Travis CI is no longer used --- Tests/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/helper.py b/Tests/helper.py index d7638962139..be3bdb76faa 100644 --- a/Tests/helper.py +++ b/Tests/helper.py @@ -270,7 +270,7 @@ def on_github_actions(): def on_ci(): - # GitHub Actions, Travis and AppVeyor have "CI" + # GitHub Actions and AppVeyor have "CI" return "CI" in os.environ From 924b1496c3618f91aeb9875f7294fb526f8c4d6f Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 18 Dec 2020 12:37:24 +0200 Subject: [PATCH 5/5] Show example link instead of hiding inside hyperlink Co-authored-by: Andrew Murray <3112309+radarhere@users.noreply.github.com> --- .github/CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e20296da5a7..563fcda6a75 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,7 +9,7 @@ Please send a pull request to the master branch. Please include [documentation]( - Fork the Pillow repository. - Create a branch from master. - Develop bug fixes, features, tests, etc. -- Run the test suite. You can enable [GitHub Actions](http://github.com/MY-USERNAME/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests. +- Run the test suite. You can enable GitHub Actions (https://github.com/MY-USERNAME/Pillow/actions) and [AppVeyor](https://ci.appveyor.com/projects/new) on your repo to catch test failures prior to the pull request, and [Codecov](https://codecov.io/gh) to see if the changed code is covered by tests. - Create a pull request to pull the changes from your branch to the Pillow master. ### Guidelines