Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated numpy to 1.22 in CIs #105

Closed
wants to merge 2 commits into from
Closed

Updated numpy to 1.22 in CIs #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd92516
Added patch to prevent quoting of PILLOW_VERSION
radarhere Jan 4, 2022
2d317e7
Reduce CI jobs
radarhere Jan 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions azure-pipelines.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ source:
# 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/0004-Do-not-quote-PILLOW_VERSION.patch

build:
number: 0
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0001-Build-without-USE_WIN32_FILEIO.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 889ee00643d8f4d744663aea5f7dda3fe868e829 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/4] Build without USE_WIN32_FILEIO

This keeps things consistent with current conda-forge builds of tiff
(and poppler).
Expand Down
3 changes: 1 addition & 2 deletions recipe/patches/0002-Only-prefer-command-line-tools-SDK-on-macOS-over-the.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
From c60bdf31dade079f53c217edd92230566e700db4 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 11 Nov 2021 20:47:46 +1100
Subject: [PATCH 2/3] Only prefer command line tools SDK on macOS over the
Subject: [PATCH 2/4] Only prefer command line tools SDK on macOS over the
default

---
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0003-Moved-macOS-SDK-logic-into-a-separate-method.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From d9afb11be92a317de829f82aa175d3cdc572ec8e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 11 Nov 2021 20:51:13 +1100
Subject: [PATCH 3/3] Moved macOS SDK logic into a separate method
Subject: [PATCH 3/4] Moved macOS SDK logic into a separate method

---
setup.py | 41 ++++++++++++++++++++++-------------------
Expand Down
33 changes: 33 additions & 0 deletions recipe/patches/0004-Do-not-quote-PILLOW_VERSION.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 6c7bae7d19f7fcd52a7ffc519aa76eb71f10f9bb Tue Jan 4 13:54:46 2022
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Tue, Jan 4 2022 13:54:46 +1100
Subject: [PATCH 4/4] Do not quote PILLOW_VERSION

Do not quote PILLOW_VERSION

---
setup.py | 9 +--------
1 file changed, 1 insertions(+), 8 deletions(-)

diff --git a/setup.py b/setup.py
index 23d91a5f2..35e8cf817 100755
--- a/setup.py
+++ b/setup.py
@@ -840,14 +840,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