From 397a443d46a8ffb3697395cbcca59d68ae081651 Mon Sep 17 00:00:00 2001 From: Alexander Piskun <13381981+bigcat88@users.noreply.github.com> Date: Mon, 1 Jul 2024 22:16:26 +0300 Subject: [PATCH] v0.17.0 [publish] Signed-off-by: Alexander Piskun --- .github/workflows/wheels-pi_heif.yml | 10 ++-------- .github/workflows/wheels-pillow_heif.yml | 2 +- ci/cirrus_wheels.yml | 4 ++-- pi-heif/README.md | 4 ++-- pillow_heif/as_plugin.py | 2 +- 5 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.github/workflows/wheels-pi_heif.yml b/.github/workflows/wheels-pi_heif.yml index 4a2ec611..8cbaa150 100644 --- a/.github/workflows/wheels-pi_heif.yml +++ b/.github/workflows/wheels-pi_heif.yml @@ -109,7 +109,7 @@ jobs: env: CIBW_ARCHS: "x86_64" CIBW_ENVIRONMENT_MACOS: PH_LIGHT_ACTION=1 TEST_DECODE_THREADS=0 - MACOSX_DEPLOYMENT_TARGET: "11.0" + MACOSX_DEPLOYMENT_TARGET: "12.0" - name: Checking built wheels run: | @@ -128,7 +128,7 @@ jobs: fail-fast: true matrix: cibw_buildlinux: [ manylinux, musllinux ] - cibw_arch: [ "aarch64", "i686", "x86_64" ] + cibw_arch: [ "aarch64", "x86_64" ] name: ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }} • CPython runs-on: ubuntu-20.04 env: @@ -154,12 +154,6 @@ jobs: env: OS_PACKAGES: "fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev" - - name: 32-bit manylinux preparations - if: matrix.cibw_buildlinux == 'manylinux' - run: echo INSTALL_OS_PACKAGES="yum makecache && yum install -y $OS_PACKAGES" >> $GITHUB_ENV - env: - OS_PACKAGES: "libjpeg-turbo-devel lcms2-devel" - - uses: actions/cache@v4 with: path: ${{ env.BUILD_DIR }} diff --git a/.github/workflows/wheels-pillow_heif.yml b/.github/workflows/wheels-pillow_heif.yml index beec7cee..97cc4239 100644 --- a/.github/workflows/wheels-pillow_heif.yml +++ b/.github/workflows/wheels-pillow_heif.yml @@ -101,7 +101,7 @@ jobs: env: CIBW_ARCHS: "x86_64" CIBW_ENVIRONMENT_MACOS: PH_FULL_ACTION=1 TEST_DECODE_THREADS=0 - MACOSX_DEPLOYMENT_TARGET: "11.0" + MACOSX_DEPLOYMENT_TARGET: "12.0" - name: Check built wheels run: | diff --git a/ci/cirrus_wheels.yml b/ci/cirrus_wheels.yml index afa9c8a1..583c82ae 100644 --- a/ci/cirrus_wheels.yml +++ b/ci/cirrus_wheels.yml @@ -8,7 +8,7 @@ wheel_macos_arm_task: env: PATH: /opt/homebrew/opt/python@3.10/bin:$PATH CIBW_ARCHS: arm64 - CIBW_ENVIRONMENT: 'MACOSX_DEPLOYMENT_TARGET=12.0 PH_FULL_ACTION=1' + CIBW_ENVIRONMENT: 'MACOSX_DEPLOYMENT_TARGET=14.0 PH_FULL_ACTION=1' install_pre_requirements_script: - brew update || true @@ -32,7 +32,7 @@ wheel_pi_heif_macos_arm_task: env: PATH: /opt/homebrew/opt/python@3.10/bin:$PATH CIBW_ARCHS: arm64 - CIBW_ENVIRONMENT: 'MACOSX_DEPLOYMENT_TARGET=12.0 PH_LIGHT_ACTION=1' + CIBW_ENVIRONMENT: 'MACOSX_DEPLOYMENT_TARGET=14.0 PH_LIGHT_ACTION=1' install_pre_requirements_script: - brew update || true diff --git a/pi-heif/README.md b/pi-heif/README.md index ad614116..1b63c05f 100644 --- a/pi-heif/README.md +++ b/pi-heif/README.md @@ -94,6 +94,6 @@ if im.info["depth_images"]: | PyPy 3.9 v7.3 | ✅ | ✅ | ✅ | N/A | ✅ | | PyPy 3.10 v7.3 | ✅ | ✅ | ✅ | N/A | ✅ | -* **i686**, **x86_64**, **aarch64** wheels. +* **x86_64**, **aarch64** wheels. -`ARMv7l`: wheels are present for Debian 11+(Ubuntu 20.04+) and Alpine 3.16/3.17/3.18 +`ARMv7l`: wheels are present for Debian 11+(Ubuntu 20.04+) and Alpine 3.16+ diff --git a/pillow_heif/as_plugin.py b/pillow_heif/as_plugin.py index d8c48b19..d39db826 100644 --- a/pillow_heif/as_plugin.py +++ b/pillow_heif/as_plugin.py @@ -82,7 +82,7 @@ def getxmp(self) -> dict: if self.info.get("xmp", None): xmp_data = self.info["xmp"].rsplit(b"\x00", 1) if xmp_data[0]: - return self._getxmp(xmp_data[0]) + return self._getxmp(xmp_data[0]) # pylint: disable=no-member return {} def seek(self, frame):