Skip to content

Commit 4986609

Browse files
committed
Use zlib-ng on macOS
1 parent dab795c commit 4986609

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

.github/workflows/wheels-dependencies.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ if [[ -n "$IS_MACOS" ]]; then
5050
else
5151
GIFLIB_VERSION=5.2.1
5252
fi
53-
if [[ -n "$IS_MACOS" ]]; then
54-
ZLIB_VERSION=1.3.1
55-
else
56-
ZLIB_NG_VERSION=2.2.2
57-
fi
53+
ZLIB_NG_VERSION=2.2.2
5854
LIBWEBP_VERSION=1.4.0
5955
BZIP2_VERSION=1.0.8
6056
LIBXCB_VERSION=1.17.0
@@ -111,11 +107,7 @@ function build {
111107
if [ -z "$IS_ALPINE" ] && [ -z "$IS_MACOS" ]; then
112108
yum remove -y zlib-devel
113109
fi
114-
if [ -n "$IS_MACOS" ]; then
115-
build_new_zlib
116-
else
117-
build_zlib_ng
118-
fi
110+
build_zlib_ng
119111

120112
build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
121113
if [ -n "$IS_MACOS" ]; then

Tests/check_wheel.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,5 @@ def test_wheel_features() -> None:
4040

4141
if sys.platform == "win32":
4242
expected_features.remove("xcb")
43-
elif sys.platform == "darwin":
44-
expected_features.remove("zlib_ng")
4543

4644
assert set(features.get_supported_features()) == expected_features

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ test-extras = "tests"
104104

105105
[tool.cibuildwheel.macos.environment]
106106
PATH = "$(pwd)/build/deps/darwin/bin:$(dirname $(which python3)):/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin"
107+
DYLD_LIBRARY_PATH = "$(pwd)/build/deps/darwin/lib"
107108

108109
[tool.black]
109110
exclude = "wheels/multibuild"

0 commit comments

Comments
 (0)