From e392a3aea1c3cb01a467b7fcf761afe28e07f965 Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Fri, 17 Feb 2023 17:12:46 +0200 Subject: [PATCH 1/4] DOR update to 9.4.0 --- recipe/meta.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 7b9b4d6..739317f 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,5 +1,5 @@ {% set name = "pillow" %} -{% set version = "9.3.0" %} +{% set version = "9.4.0" %} package: name: {{ name|lower }} @@ -7,7 +7,7 @@ package: source: url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/Pillow-{{ version }}.tar.gz - sha256: c935a22a557a560108d780f9a0fc426dd7459940dc54faa49d83249c8d3e760f + sha256: a1c2d7780448eb93fbcc3789bf3916aa5720d942e37945f4056680317f1cd23e patches: # [unix] - disable_detect.patch # [unix] From 55feaee529b52eb3abad6667afa8cae2a5bb3b6e Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 23 Feb 2023 12:43:00 +0200 Subject: [PATCH 2/4] Fix setuptools, remove libwebp-base on osx-arm64 --- recipe/meta.yaml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 739317f..1c84c08 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -12,7 +12,7 @@ source: - disable_detect.patch # [unix] build: - number: 2 + number: 0 skip: true # [py<37] requirements: @@ -23,13 +23,7 @@ requirements: host: - python - pip - # 2022/7/14: The issue was observed with 'import PIL.Image' in v9.2.0: - # Additional double quotes for Core version: "9.2.0" on win-64 for python 3.7 and python 3.8. - # The last version of pillow we built (v9.0.1) was built using conda-build-3.21.7, - # Looking at the conda-build changelog for v3.21.9, it was noticed some changes to support the new setuptools >=60.0 - # Check if the issue persists in the next releases - - setuptools <60 # [win and (py==37 or py==38)] - - setuptools # [not (win and (py==37 or py==38))] + - setuptools - wheel # Required by default - jpeg 9e @@ -49,7 +43,6 @@ requirements: - jpeg >=9e,<10a - libtiff >=4.2.0,<5.0a0 - libwebp >=1.2.0,<1.3.0a0 - - libwebp-base >=1.2.0,<1.3.0a0 # [osx and arm64] - tk >=8.6.12,<8.7.0a0 - zlib >=1.2.13,<1.3.0a0 From 51ff13251aac972ce4939b31ecf2210612af293f Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 23 Feb 2023 12:50:20 +0200 Subject: [PATCH 3/4] Return libwebp-base on osx-arm64 --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 1c84c08..cd206b9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -43,6 +43,7 @@ requirements: - jpeg >=9e,<10a - libtiff >=4.2.0,<5.0a0 - libwebp >=1.2.0,<1.3.0a0 + - libwebp-base >=1.2.0,<1.3.0a0 # [osx and arm64] - tk >=8.6.12,<8.7.0a0 - zlib >=1.2.13,<1.3.0a0 From 86d6ab5b387fcd0be2f3087dbc0c13addf904e8a Mon Sep 17 00:00:00 2001 From: Serhii Kupriienko Date: Thu, 23 Feb 2023 18:01:01 +0200 Subject: [PATCH 4/4] Returm back setuptools pinning for win --- recipe/meta.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index cd206b9..8e40cbc 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -23,7 +23,13 @@ requirements: host: - python - pip - - setuptools + # 2022/7/14: The issue was observed with 'import PIL.Image' in v9.2.0: + # Additional double quotes for Core version: "9.2.0" on win-64 for python 3.7 and python 3.8. + # The last version of pillow we built (v9.0.1) was built using conda-build-3.21.7, + # Looking at the conda-build changelog for v3.21.9, it was noticed some changes to support the new setuptools >=60.0 + # 2023/2/23: It persists in 9.4.0. Check if the issue persists in the next releases + - setuptools <60 # [win and (py==37 or py==38)] + - setuptools # [not (win and (py==37 or py==38))] - wheel # Required by default - jpeg 9e