From 5057f0afaf43aacde659ee7798567d9cb3629a89 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 22 Oct 2021 12:01:42 +0300 Subject: [PATCH 1/7] Replace 'setup.py sdist' with '-m build --sdist' --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index af3059f34..a15d6bb97 100644 --- a/Makefile +++ b/Makefile @@ -96,7 +96,8 @@ release-test: .PHONY: sdist sdist: - python3 setup.py sdist --format=gztar + python3 -m build --help > /dev/null 2>&1 || python3 -m pip install build + python3 -m build --sdist .PHONY: test test: From e3c8ef980b9faeb2f30056e42eba9da7e1dceccf Mon Sep 17 00:00:00 2001 From: Lucy Phipps Date: Sun, 24 Oct 2021 12:38:13 +0100 Subject: [PATCH 2/7] fix compilation on Termux --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3574c9137..b0426961c 100755 --- a/setup.py +++ b/setup.py @@ -561,7 +561,11 @@ class pil_build_ext(build_ext): # headers are at $PREFIX/include # user libs are at $PREFIX/lib _add_directory( - library_dirs, os.path.join(os.environ["ANDROID_ROOT"], "lib") + library_dirs, + os.path.join( + os.environ["ANDROID_ROOT"], + "lib" if struct.calcsize("l") == 4 else "lib64" + ) ) elif sys.platform.startswith("netbsd"): From f246049c4a96aa87fd81a24490fc74399cfb8f28 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 24 Oct 2021 11:39:07 +0000 Subject: [PATCH 3/7] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index b0426961c..c53813a1e 100755 --- a/setup.py +++ b/setup.py @@ -564,8 +564,8 @@ class pil_build_ext(build_ext): library_dirs, os.path.join( os.environ["ANDROID_ROOT"], - "lib" if struct.calcsize("l") == 4 else "lib64" - ) + "lib" if struct.calcsize("l") == 4 else "lib64", + ), ) elif sys.platform.startswith("netbsd"): From 97ed2ecd97d025afa862164d82409ea351175658 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 27 Oct 2021 22:51:54 +1100 Subject: [PATCH 4/7] Changed URLs to https --- src/PIL/ImageCms.py | 4 ++-- src/PIL/ImageOps.py | 2 +- src/_imagingcms.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/PIL/ImageCms.py b/src/PIL/ImageCms.py index 369909590..60e700f09 100644 --- a/src/PIL/ImageCms.py +++ b/src/PIL/ImageCms.py @@ -34,9 +34,9 @@ pyCMS a Python / PIL interface to the littleCMS ICC Color Management System Copyright (C) 2002-2003 Kevin Cazabon kevin@cazabon.com - http://www.cazabon.com + https://www.cazabon.com - pyCMS home page: http://www.cazabon.com/pyCMS + pyCMS home page: https://www.cazabon.com/pyCMS littleCMS home page: https://www.littlecms.com (littleCMS is Copyright (C) 1998-2001 Marti Maria) diff --git a/src/PIL/ImageOps.py b/src/PIL/ImageOps.py index f0c932d33..b170e9d8c 100644 --- a/src/PIL/ImageOps.py +++ b/src/PIL/ImageOps.py @@ -439,7 +439,7 @@ def fit(image, size, method=Image.BICUBIC, bleed=0.0, centering=(0.5, 0.5)): # by Kevin Cazabon, Feb 17/2000 # kevin@cazabon.com - # http://www.cazabon.com + # https://www.cazabon.com # ensure centering is mutable centering = list(centering) diff --git a/src/_imagingcms.c b/src/_imagingcms.c index 1446bd02b..9b5a121d7 100644 --- a/src/_imagingcms.c +++ b/src/_imagingcms.c @@ -3,14 +3,14 @@ * a Python / PIL interface to the littleCMS ICC Color Management System * Copyright (C) 2002-2003 Kevin Cazabon * kevin@cazabon.com - * http://www.cazabon.com + * https://www.cazabon.com * Adapted/reworked for PIL by Fredrik Lundh * Copyright (c) 2009 Fredrik Lundh * Updated to LCMS2 * Copyright (c) 2013 Eric Soroos * - * pyCMS home page: http://www.cazabon.com/pyCMS - * littleCMS home page: http://www.littlecms.com + * pyCMS home page: https://www.cazabon.com/pyCMS + * littleCMS home page: https://www.littlecms.com * (littleCMS is Copyright (C) 1998-2001 Marti Maria) * * Originally released under LGPL. Graciously donated to PIL in @@ -23,7 +23,7 @@ pyCMS\n\ a Python / PIL interface to the littleCMS ICC Color Management System\n\ Copyright (C) 2002-2003 Kevin Cazabon\n\ kevin@cazabon.com\n\ -http://www.cazabon.com\n\ +https://www.cazabon.com\n\ " #define PY_SSIZE_T_CLEAN From a215f725ba98efeb48194460b8796be3acd6173f Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 31 Oct 2021 17:51:23 +1100 Subject: [PATCH 5/7] Update CHANGES.rst [ci skip] --- CHANGES.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES.rst b/CHANGES.rst index f362c6ce4..3d422a52d 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -5,6 +5,9 @@ Changelog (Pillow) 9.0.0 (unreleased) ------------------ +- Fix compilation on 64-bit Termux #5793 + [landfillbaby] + - Use title for display in ImageShow #5788 [radarhere] From 73d9209bf98c2f9f3f3c883b7b43b63a7048f98e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Tue, 5 Oct 2021 12:18:50 +0300 Subject: [PATCH 6/7] Test Python 3.10.0 final on AppVeyor --- .appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 6cf40130e..72f79248f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -10,7 +10,7 @@ environment: TEST_OPTIONS: DEPLOY: YES matrix: - - PYTHON: C:/Python39 + - PYTHON: C:/Python310 ARCHITECTURE: x86 APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - PYTHON: C:/Python36-x64 @@ -19,6 +19,7 @@ environment: install: +- '%PYTHON%\%EXECUTABLE% --version' - curl -fsSL -o pillow-depends.zip https://github.com/python-pillow/pillow-depends/archive/main.zip - 7z x pillow-depends.zip -oc:\ - mv c:\pillow-depends-main c:\pillow-depends From 25979a51e73033aeb44d398b94e280c61641b7f2 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Wed, 3 Nov 2021 21:31:12 +1100 Subject: [PATCH 7/7] Added Fedora 35 --- .github/workflows/test-docker.yml | 1 + docs/installation.rst | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index 46e9e5f2c..3a2b501b1 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -23,6 +23,7 @@ jobs: centos-stream-8-amd64, debian-10-buster-x86, fedora-34-amd64, + fedora-35-amd64, ubuntu-18.04-bionic-amd64, ubuntu-20.04-focal-amd64, ] diff --git a/docs/installation.rst b/docs/installation.rst index fc5b0e7e9..218a123bc 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -462,6 +462,8 @@ These platforms are built and tested for every change. +----------------------------------+---------------------------------+---------------------+ | Fedora 34 | 3.9 | x86-64 | +----------------------------------+---------------------------------+---------------------+ +| Fedora 35 | 3.10 | x86-64 | ++----------------------------------+---------------------------------+---------------------+ | macOS 10.15 Catalina | 3.6, 3.7, 3.8, 3.9, 3.10, PyPy3 | x86-64 | +----------------------------------+---------------------------------+---------------------+ | Ubuntu Linux 18.04 LTS (Bionic) | 3.6 | x86-64 |