Merge branch 'master' into fix-imagingHinclude

.appveyor.yml

@@ -24,8 +24,8 @@ install:
 - mv c:\pillow-depends-master c:\pillow-depends
 - xcopy /s c:\pillow-depends\test_images\* c:\pillow\tests\images
 - 7z x ..\pillow-depends\nasm-2.14.02-win64.zip -oc:\
-- ..\pillow-depends\gs9531w32.exe /S
-- path c:\nasm-2.14.02;C:\Program Files (x86)\gs\gs9.53.1\bin;%PATH%
+- ..\pillow-depends\gs9533w32.exe /S
+- path c:\nasm-2.14.02;C:\Program Files (x86)\gs\gs9.53.3\bin;%PATH%
 - cd c:\pillow\winbuild\
 - ps: |
         c:\python37\python.exe c:\pillow\winbuild\build_prepare.py -v --depends=C:\pillow-depends\

.ci/install.sh

@@ -21,7 +21,7 @@ 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
+if [[ $TRAVIS_CPU_ARCH == "s390x" || $TRAVIS_CPU_ARCH == "ppc64le" ]]; then sudo chown $USER ~/.cache/pip/wheels ; fi
 
 pip install --upgrade pip
 PYTHONOPTIMIZE=0 pip install cffi
@@ -33,8 +33,10 @@ pip install pyroma
 pip install test-image-results
 pip install numpy
 
-# TODO Remove when 3.9-dev includes setuptools 49.3.2+:
-if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi
+# TODO Remove when 3.8 / 3.9 / PyPy3 includes setuptools 49.3.2+:
+if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then pip install -U "setuptools>=49.3.2" ; fi
+if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then pip install -U "setuptools>=49.3.2" ; fi
+if [ "$TRAVIS_PYTHON_VERSION" == "pypy3.6-7.3.1" ]; then pip install -U "setuptools>=49.3.2" ; fi
 
 if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then
   # arm64, ppc64le, s390x CPUs:

.github/mergify.yml

@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: Automatic merge
+    conditions:
+      - "#approved-reviews-by>=1"
+      - label=automerge
+      - status-success=Lint
+      - status-success=Test Successful
+      - status-success=Docker Test Successful
+      - status-success=Windows Test Successful
+      - status-success=continuous-integration/appveyor/pr
+      - status-success=continuous-integration/travis-ci/pr
+    actions:
+      merge:
+        method: merge

.github/workflows/macos-install.sh

@@ -15,8 +15,9 @@ pip install test-image-results
 echo -e "[openblas]\nlibraries = openblas\nlibrary_dirs = /usr/local/opt/openblas/lib" >> ~/.numpy-site.cfg
 pip install numpy
 
-# TODO Remove when 3.9-dev includes setuptools 49.3.2+:
-if [ "$GHA_PYTHON_VERSION" == "3.9-dev" ]; then pip install -U "setuptools>=49.3.2" ; fi
+# TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
+if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then pip install -U "setuptools>=49.3.2" ; fi
+if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then pip install -U "setuptools>=49.3.2" ; fi
 
 # extra test images
 pushd depends && ./install_extra_test_images.sh && popd

.github/workflows/test-docker.yml

@@ -61,3 +61,11 @@ jobs:
       with:
         flags: GHA_Docker
         name: ${{ matrix.docker }}
+
+  success:
+    needs: build
+    runs-on: ubuntu-latest
+    name: Docker Test Successful
+    steps:
+      - name: Success
+        run: echo Docker Test Successful

.github/workflows/test-windows.yml

@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9-dev", "pypy3"]
+        python-version: ["3.6", "3.7", "3.8", "3.9", "pypy3"]
         architecture: ["x86", "x64"]
         include:
           - architecture: "x86"
@@ -54,7 +54,7 @@ jobs:
 
     - name: Set up TCL
       if: "contains(matrix.python-version, 'pypy')"
-      run: Write-Host "::set-env name=TCL_LIBRARY::$env:pythonLocation\tcl\tcl8.5"
+      run: echo "TCL_LIBRARY=$env:pythonLocation\tcl\tcl8.5" >> $env:GITHUB_ENV
       shell: pwsh
 
     - name: Print build system information
@@ -63,18 +63,18 @@ jobs:
     - name: pip install wheel pytest pytest-cov
       run: python -m pip install wheel pytest pytest-cov
 
-    # TODO Remove when 3.9-dev includes setuptools 49.3.2+:
+    # TODO Remove when 3.8 / 3.9 includes setuptools 49.3.2+:
     - name: Upgrade setuptools
-      if: "contains(matrix.python-version, '3.9-dev')"
+      if: "contains(matrix.python-version, '3.8') || contains(matrix.python-version, '3.9')"
       run: python -m pip install -U "setuptools>=49.3.2"
 
     - name: Install dependencies
       run: |
         7z x winbuild\depends\nasm-2.14.02-win64.zip "-o$env:RUNNER_WORKSPACE\"
-        Write-Host "::add-path::$env:RUNNER_WORKSPACE\nasm-2.14.02"
+        echo "$env:RUNNER_WORKSPACE\nasm-2.14.02" >> $env:GITHUB_PATH
 
-        winbuild\depends\gs9531w32.exe /S
-        Write-Host "::add-path::C:\Program Files (x86)\gs\gs9.53.1\bin"
+        winbuild\depends\gs9533w32.exe /S
+        echo "C:\Program Files (x86)\gs\gs9.53.3\bin" >> $env:GITHUB_PATH
 
         xcopy /s winbuild\depends\test_images\* Tests\images\
       shell: pwsh
@@ -105,6 +105,10 @@ jobs:
     - name: Build dependencies / WebP
       if: steps.build-cache.outputs.cache-hit != 'true'
       run: "& winbuild\\build\\build_dep_libwebp.cmd"
+    # for FreeType CBDT font support
+    - name: Build dependencies / libpng
+      if: steps.build-cache.outputs.cache-hit != 'true'
+      run: "& winbuild\\build\\build_dep_libpng.cmd"
     - name: Build dependencies / FreeType
       if: steps.build-cache.outputs.cache-hit != 'true'
       run: "& winbuild\\build\\build_dep_freetype.cmd"
@@ -224,7 +228,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up shell
-        run: echo ::add-path::C:\msys64\usr\bin\
+        run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
         shell: pwsh
 
       - name: Install Dependencies
@@ -267,3 +271,11 @@ jobs:
           bash <(curl -s https://codecov.io/bash) -F GHA_Windows
         env:
           CODECOV_NAME: ${{ matrix.name }}
+
+  success:
+    needs: [build, msys]
+    runs-on: ubuntu-latest
+    name: Windows Test Successful
+    steps:
+      - name: Success
+        run: echo Windows Test Successful

.github/workflows/test.yml

@@ -14,7 +14,7 @@ jobs:
         ]
         python-version: [
           "pypy3",
-          "3.9-dev",
+          "3.9",
           "3.8",
           "3.7",
           "3.6",
@@ -107,3 +107,11 @@ jobs:
       run: bash <(curl -s https://codecov.io/bash) -F ${{ matrix.codecov-flag }}
       env:
         CODECOV_NAME: ${{ matrix.os }} Python ${{ matrix.python-version }}
+
+  success:
+    needs: build
+    runs-on: ubuntu-latest
+    name: Test Successful
+    steps:
+      - name: Success
+        run: echo Test Successful

.travis.yml

@@ -26,7 +26,7 @@ matrix:
     - python: "3.8"
       arch: s390x
 
-    - python: "pypy3"
+    - python: "pypy3.6-7.3.1"
       name: "PyPy3 Xenial"
     - python: "3.9-dev"
       name: "3.9-dev Xenial"

CHANGES.rst

@@ -5,6 +5,45 @@ Changelog (Pillow)
 8.0.0 (unreleased)
 ------------------
 
+- Add getlength and getbbox functions for TrueType fonts #4959
+  [nulano, radarhere, hugovk]
+
+- Drop support for PyPy3 < 7.2.0 #4964
+  [nulano]
+
+- Allow tuples with one item to give single color value in getink #4927
+  [radarhere, nulano]
+
+- Add support for CBDT and COLR fonts #4955
+  [nulano, hugovk]
+
+- Removed OSError in favour of DecompressionBombError for BMP #4966
+  [radarhere]
+
+- Implemented another ellipse drawing algorithm #4523
+  [xtsm, radarhere]
+
+- Removed unused JpegImagePlugin._fixup_dict function #4957
+  [radarhere]
+
+- Added reading and writing of private PNG chunks #4292
+  [radarhere]
+
+- Implement anchor for TrueType fonts #4930
+  [nulano, hugovk]
+
+- Fixed bug in Exif __delitem__ #4942
+  [radarhere]
+
+- Fix crash in ImageTk.PhotoImage on MinGW 64-bit #4946
+  [nulano]
+
+- Moved CVE images to pillow-depends #4929
+  [radarhere]
+
+- Refactor font_getsize and font_render #4910
+  [nulano]
+
 - Fixed loading profile with non-ASCII path on Windows #4914
   [radarhere]
 
@@ -4008,7 +4047,7 @@ Pre-fork
     This section may not be fully complete.  For changes since this file
     was last updated, see the repository revision history:
 
-      https://bitbucket.org/effbot/pil-2009-raclette/commits/all
+      http://svn.effbot.org/public/pil/
 
     (1.1.7 final)
 

Makefile

@@ -64,7 +64,7 @@ install:
 
 .PHONY: install-coverage
 install-coverage:
-	CFLAGS="-coverage" python3 setup.py build_ext install
+	CFLAGS="-coverage -Werror=implicit-function-declaration" python3 setup.py build_ext install
 	python3 selftest.py
 
 .PHONY: debug

README.md

@@ -80,6 +80,14 @@ As of 2019, Pillow development is
     </tr>
 </table>
 
+## Overview
+
+The Python Imaging Library adds image processing capabilities to your Python interpreter.
+
+This library provides extensive file format support, an efficient internal representation, and fairly powerful image processing capabilities.
+
+The core image library is designed for fast access to data stored in a few basic pixel formats. It should provide a solid foundation for a general image processing tool.
+
 ## More Information
 
 - [Documentation](https://pillow.readthedocs.io/)

Tests/check_tiff_crashes.py

@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-# Reproductions/tests for crashes/read errors in TiffDecode.c
-
-# When run in python, all of these images should fail for
-# one reason or another, either as a buffer overrun,
-# unrecognized datastream, or truncated image file.
-# There shouldn't be any segfaults.
-#
-# if run like
-# `valgrind --tool=memcheck python check_tiff_crashes.py  2>&1 | grep TiffDecode.c`
-# the output should be empty. There may be python issues
-# in the valgrind especially if run in a debug python
-# version.
-
-
-from PIL import Image
-
-repro_read_strip = (
-    "images/crash_1.tif",
-    "images/crash_2.tif",
-)
-
-for path in repro_read_strip:
-    with Image.open(path) as im:
-        try:
-            im.load()
-        except Exception as msg:
-            print(msg)

Tests/fonts/LICENSE.txt

@@ -1,13 +1,20 @@
 
 NotoNastaliqUrdu-Regular.ttf and NotoSansSymbols-Regular.ttf, from https://github.com/googlei18n/noto-fonts
+NotoSans-Regular.ttf, from https://www.google.com/get/noto/
 NotoSansJP-Thin.otf, from https://www.google.com/get/noto/help/cjk/
+NotoColorEmoji.ttf, from https://github.com/googlefonts/noto-emoji
 AdobeVFPrototype.ttf, from https://github.com/adobe-fonts/adobe-variable-font-prototype
 TINY5x3GX.ttf, from http://velvetyne.fr/fonts/tiny
 ArefRuqaa-Regular.ttf, from https://github.com/google/fonts/tree/master/ofl/arefruqaa
 ter-x20b.pcf, from http://terminus-font.sourceforge.net/
+BungeeColor-Regular_colr_Windows.ttf, from https://github.com/djrrb/bungee
 
 All of the above fonts are published under the SIL Open Font License (OFL) v1.1 (http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&id=OFL), which allows you to copy, modify, and redistribute them if you need to.
 
+OpenSansCondensed-LightItalic.tt, from https://fonts.google.com/specimen/Open+Sans, under Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+
+DejaVuSans-24-{1,2,4,8}-stripped.ttf are based on DejaVuSans.ttf converted using FontForge to add bitmap strikes and keep only the ASCII range.
+
 
 10x20-ISO8859-1.pcf, from https://packages.ubuntu.com/xenial/xfonts-base
 

Tests/helper.py

@@ -11,6 +11,7 @@ import tempfile
 from io import BytesIO
 
 import pytest
+from packaging.version import parse as parse_version
 
 from PIL import Image, ImageMath, features
 
@@ -162,6 +163,16 @@ def skip_unless_feature(feature):
     return pytest.mark.skipif(not features.check(feature), reason=reason)
 
 
+def skip_unless_feature_version(feature, version_required, reason=None):
+    if not features.check(feature):
+        return pytest.mark.skip(f"{feature} not available")
+    if reason is None:
+        reason = f"{feature} is older than {version_required}"
+    version_required = parse_version(version_required)
+    version_available = parse_version(features.version(feature))
+    return pytest.mark.skipif(version_available < version_required, reason=reason)
+
+
 @pytest.mark.skipif(sys.platform.startswith("win32"), reason="Requires Unix or macOS")
 class PillowLeakTestCase:
     # requires unix/macOS