mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-08-15 09:44:46 +03:00
Revert "Revert to zlib on macOS < 10.15"
This reverts commit 6c7917d7a6
.
This commit is contained in:
parent
d975e312e2
commit
b8ffea2c56
7
.github/workflows/wheels-dependencies.sh
vendored
7
.github/workflows/wheels-dependencies.sh
vendored
|
@ -101,7 +101,6 @@ OPENJPEG_VERSION=2.5.3
|
|||
XZ_VERSION=5.8.1
|
||||
TIFF_VERSION=4.7.0
|
||||
LCMS2_VERSION=2.17
|
||||
ZLIB_VERSION=1.3.1
|
||||
ZLIB_NG_VERSION=2.2.5
|
||||
LIBWEBP_VERSION=1.6.0
|
||||
BZIP2_VERSION=1.0.8
|
||||
|
@ -259,11 +258,7 @@ function build {
|
|||
if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
|
||||
yum remove -y zlib-devel
|
||||
fi
|
||||
if [[ -n "$IS_MACOS" ]] && [[ "$MACOSX_DEPLOYMENT_TARGET" == "10.10" || "$MACOSX_DEPLOYMENT_TARGET" == "10.13" ]]; then
|
||||
build_new_zlib
|
||||
else
|
||||
build_zlib_ng
|
||||
fi
|
||||
build_zlib_ng
|
||||
|
||||
build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
|
||||
if [[ -n "$IS_MACOS" ]]; then
|
||||
|
|
|
@ -4,7 +4,6 @@ import platform
|
|||
import sys
|
||||
|
||||
from PIL import features
|
||||
from Tests.helper import is_pypy
|
||||
|
||||
|
||||
def test_wheel_modules() -> None:
|
||||
|
@ -48,8 +47,6 @@ def test_wheel_features() -> None:
|
|||
|
||||
if sys.platform == "win32":
|
||||
expected_features.remove("xcb")
|
||||
elif sys.platform == "darwin" and not is_pypy() and platform.processor() != "arm":
|
||||
expected_features.remove("zlib_ng")
|
||||
elif sys.platform == "ios":
|
||||
# Can't distribute raqm due to licensing, and there's no system version;
|
||||
# fribidi and harfbuzz won't be available if raqm isn't available.
|
||||
|
|
Loading…
Reference in New Issue
Block a user