python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-27 16:39:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from review

Browse Source 
Add some minor simplifications and removes som changes that aren't strictly necessary.
This commit is contained in:
Russell Keith-Magee 2025-06-23 08:14:42 +08:00 committed by GitHub
commit 4cc71ec23e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/workflows/wheels-dependencies.sh vendored
View File

@ -42,11 +42,10 @@ if [[ "$CIBW_PLATFORM" == "ios" ]]; then
fi fi
IOS_SDK_PATH=$(xcrun --sdk $IOS_SDK --show-sdk-path) IOS_SDK_PATH=$(xcrun --sdk $IOS_SDK --show-sdk-path)
if [[ "$IOS_SDK" == "iphonesimulator" ]]; then
CMAKE_SYSTEM_NAME=iOS CMAKE_SYSTEM_NAME=iOS
if [[ "$IOS_SDK" == "iphonesimulator" ]]; then
IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET-simulator IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET-simulator
else else
CMAKE_SYSTEM_NAME=iOS
IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET IOS_HOST_TRIPLE=$PLAT-apple-ios$IPHONEOS_DEPLOYMENT_TARGET
fi fi
@ -163,8 +162,6 @@ function build_zlib_ng {
function build_brotli { function build_brotli {
if [ -e brotli-stamp ]; then return; fi if [ -e brotli-stamp ]; then return; fi
local name=brotli
local version=$BROTLI_VERSION
local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz) local out_dir=$(fetch_unpack https://github.com/google/brotli/archive/v$BROTLI_VERSION.tar.gz brotli-$BROTLI_VERSION.tar.gz)
(cd $out_dir \ (cd $out_dir \
&& cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib $HOST_CMAKE_FLAGS . \ && cmake -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX -DCMAKE_INSTALL_LIBDIR=$BUILD_PREFIX/lib -DCMAKE_INSTALL_NAME_DIR=$BUILD_PREFIX/lib $HOST_CMAKE_FLAGS . \
@ -174,10 +171,8 @@ function build_brotli {
function build_harfbuzz { function build_harfbuzz {
if [ -e harfbuzz-stamp ]; then return; fi if [ -e harfbuzz-stamp ]; then return; fi
local name=harfbuzz
local version=$HARFBUZZ_VERSION
python3 -m pip install --disable-pip-version-check meson ninja python3 -m pip install meson ninja
local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz) local out_dir=$(fetch_unpack https://github.com/harfbuzz/harfbuzz/releases/download/$HARFBUZZ_VERSION/harfbuzz-$HARFBUZZ_VERSION.tar.xz harfbuzz-$HARFBUZZ_VERSION.tar.xz)
(cd $out_dir \ (cd $out_dir \
@ -302,7 +297,7 @@ if [[ -n "$IS_MACOS" ]]; then
# Ensure cmake is available, and that the default prefix used by CMake is # Ensure cmake is available, and that the default prefix used by CMake is
# the build prefix # the build prefix
python3 -m pip install --disable-pip-version-check cmake python3 -m pip install cmake
export CMAKE_PREFIX_PATH=$BUILD_PREFIX export CMAKE_PREFIX_PATH=$BUILD_PREFIX
if [[ -n "$IOS_SDK" ]]; then if [[ -n "$IOS_SDK" ]]; then

4
.github/workflows/wheels.yml vendored
View File

@ -97,17 +97,14 @@ jobs:
platform: ios platform: ios
os: macos-latest os: macos-latest
cibw_arch: arm64_iphoneos cibw_arch: arm64_iphoneos
iphoneos_deployment_target: "13.0"
- name: "iOS arm64 simulator" - name: "iOS arm64 simulator"
platform: ios platform: ios
os: macos-latest os: macos-latest
cibw_arch: arm64_iphonesimulator cibw_arch: arm64_iphonesimulator
iphoneos_deployment_target: "13.0"
- name: "iOS x86_64 simulator" - name: "iOS x86_64 simulator"
platform: ios platform: ios
os: macos-13 os: macos-13
cibw_arch: x86_64_iphonesimulator cibw_arch: x86_64_iphonesimulator
iphoneos_deployment_target: "13.0"
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
with: with:
@ -135,7 +132,6 @@ jobs:
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_PYPY_X86_64_IMAGE: ${{ matrix.manylinux }}
CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }} CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }} MACOSX_DEPLOYMENT_TARGET: ${{ matrix.macosx_deployment_target }}
IPHONEOS_DEPLOYMENT_TARGET: ${{ matrix.iphoneos_deployment_target }}
- uses: actions/upload-artifact@v4 - uses: actions/upload-artifact@v4
with: with: