diff --git a/.ci/after_success.sh b/.ci/after_success.sh index 762670f10..01889607b 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 db259bdca..3e1d64e34 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 1396445e0..5a19ec9b4 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 18be4f9f9..000000000 --- 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 b007494e9..000000000 --- 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 9758f91fd..ea57e863b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,6 @@ check-manifest coverage jarn.viewdoc olefile -pycodestyle -pyflakes pyroma pytest pytest-cov