pillow v9.0.0

.ci_support/linux_64_python3.10.____cpython.yaml

@@ -9,7 +9,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 freetype:
 - '2'
 jpeg:
@@ -40,8 +40,5 @@ target_platform:
 - linux-64
 tk:
 - '8.6'
-zip_keys:
-- - cdt_name
-  - docker_image
 zlib:
 - '1.2'

.ci_support/linux_64_python3.7.____73_pypy.yaml

@@ -9,7 +9,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 freetype:
 - '2'
 jpeg:
@@ -40,8 +40,5 @@ target_platform:
 - linux-64
 tk:
 - '8.6'
-zip_keys:
-- - cdt_name
-  - docker_image
 zlib:
 - '1.2'

.ci_support/linux_64_python3.7.____cpython.yaml

@@ -9,7 +9,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 freetype:
 - '2'
 jpeg:
@@ -40,8 +40,5 @@ target_platform:
 - linux-64
 tk:
 - '8.6'
-zip_keys:
-- - cdt_name
-  - docker_image
 zlib:
 - '1.2'

.ci_support/linux_64_python3.8.____cpython.yaml

@@ -9,7 +9,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 freetype:
 - '2'
 jpeg:
@@ -40,8 +40,5 @@ target_platform:
 - linux-64
 tk:
 - '8.6'
-zip_keys:
-- - cdt_name
-  - docker_image
 zlib:
 - '1.2'

.ci_support/linux_64_python3.9.____cpython.yaml

@@ -9,7 +9,7 @@ channel_sources:
 channel_targets:
 - conda-forge main
 docker_image:
-- quay.io/condaforge/linux-anvil-comp7
+- quay.io/condaforge/linux-anvil-cos7-x86_64
 freetype:
 - '2'
 jpeg:
@@ -40,8 +40,5 @@ target_platform:
 - linux-64
 tk:
 - '8.6'
-zip_keys:
-- - cdt_name
-  - docker_image
 zlib:
 - '1.2'

recipe/meta.yaml

@@ -1,17 +1,15 @@
-{% set version = "8.4.0" %}
+{% set version = "9.0.0" %}
 
 package:
   name: pillow
   version: {{ version }}
 
 source:
   url: https://pypi.io/packages/source/P/Pillow/Pillow-{{ version }}.tar.gz
-  sha256: b8e2f83c56e141920c39464b852de3719dfbfb6e3c99a2d8da0edf4fb33176ed
+  sha256: ee6e2963e92762923956fe5d3479b1fdc3b76c83f290aad131a2f98c3df0593e
   patches:
     - patches/0001-Build-without-USE_WIN32_FILEIO.patch
-    # Backport python-pillow/Pillow#5828 (2 patches), can be dropped for v>=9.0
-    - patches/0002-Only-prefer-command-line-tools-SDK-on-macOS-over-the.patch
-    - patches/0003-Moved-macOS-SDK-logic-into-a-separate-method.patch
+    - patches/0002-Do-not-quote-PILLOW_VERSION.patch
 
 build:
   number: 0

recipe/patches/0001-Build-without-USE_WIN32_FILEIO.patch

@@ -1,7 +1,7 @@
-From 889ee00643d8f4d744663aea5f7dda3fe868e829 Mon Sep 17 00:00:00 2001
+From 24c396fd36be736d957b92598d71e61637a20469 Mon Sep 17 00:00:00 2001
 From: Ryan May <rmay@ucar.edu>
 Date: Wed, 5 May 2021 12:42:10 -0600
-Subject: [PATCH 1/3] Build without USE_WIN32_FILEIO
+Subject: [PATCH 1/2] Build without USE_WIN32_FILEIO
 
 This keeps things consistent with current conda-forge builds of tiff
 (and poppler).
@@ -10,10 +10,10 @@ This keeps things consistent with current conda-forge builds of tiff
  1 file changed, 6 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index b56e9063..10c1b585 100755
+index 23d91a5f..c0124e6b 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -812,12 +812,6 @@ class pil_build_ext(build_ext):
+@@ -826,12 +826,6 @@ class pil_build_ext(build_ext):
          if feature.tiff:
              libs.append(feature.tiff)
              defs.append(("HAVE_LIBTIFF", None))

recipe/patches/0002-Do-not-quote-PILLOW_VERSION.patch

@@ -0,0 +1,32 @@
+From 3ecfb3f876c8b35657549233657c37d8f5a5727e Mon Sep 17 00:00:00 2001
+From: Andrew Murray <radarhere@users.noreply.github.com>
+Date: Tue, 4 Jan 2022 13:54:46 +1100
+Subject: [PATCH 2/2] Do not quote PILLOW_VERSION
+
+---
+ setup.py | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index c0124e6b..87b73b02 100755
+--- a/setup.py
++++ b/setup.py
+@@ -834,14 +834,7 @@ class pil_build_ext(build_ext):
+         if struct.unpack("h", b"\0\1")[0] == 1:
+             defs.append(("WORDS_BIGENDIAN", None))
+
+-        if (
+-            sys.platform == "win32"
+-            and sys.version_info < (3, 9)
+-            and not (PLATFORM_PYPY or PLATFORM_MINGW)
+-        ):
+-            defs.append(("PILLOW_VERSION", f'"\\"{PILLOW_VERSION}\\""'))
+-        else:
+-            defs.append(("PILLOW_VERSION", f'"{PILLOW_VERSION}"'))
++        defs.append(("PILLOW_VERSION", f'"{PILLOW_VERSION}"'))
+
+         self._update_extension("PIL._imaging", libs, defs)
+
+-- 
+2.32.0.windows.2
+