diff --git a/.github/workflows/build-cache-deps.yml b/.github/workflows/build-cache-deps.yml index bdb28f4e..78395a9a 100644 --- a/.github/workflows/build-cache-deps.yml +++ b/.github/workflows/build-cache-deps.yml @@ -39,7 +39,7 @@ jobs: platforms: arm64 - name: Install cibuildwheel & twine - run: python3 -m pip install twine cibuildwheel==2.16.2 + run: python3 -m pip install twine cibuildwheel==2.17.0 - uses: actions/cache@v4 with: @@ -98,7 +98,7 @@ jobs: platforms: arm64 - name: Install cibuildwheel & twine - run: python3 -m pip install twine cibuildwheel==2.16.2 + run: python3 -m pip install twine cibuildwheel==2.17.0 - name: 32-bit musllinux preparations if: matrix.cibw_buildlinux == 'musllinux' && matrix.cibw_arch == 'i686' diff --git a/.github/workflows/test-src-build-macos.yml b/.github/workflows/test-src-build-macos.yml index a68150bc..621d69d4 100644 --- a/.github/workflows/test-src-build-macos.yml +++ b/.github/workflows/test-src-build-macos.yml @@ -64,6 +64,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.12' + - name: Install libheif from formula run: | brew uninstall --force --ignore-dependencies imagemagick libheif @@ -119,6 +120,7 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.12' + - name: Transform to Pi-Heif run: | cp -r -v ./pi-heif/* . diff --git a/.github/workflows/wheels-pi_heif.yml b/.github/workflows/wheels-pi_heif.yml index f10ebd5f..ed57abcd 100644 --- a/.github/workflows/wheels-pi_heif.yml +++ b/.github/workflows/wheels-pi_heif.yml @@ -72,7 +72,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_ARCHS: "AMD64" @@ -104,7 +104,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_ARCHS: "x86_64" @@ -170,7 +170,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_BUILD: ${{ format('cp3*-{0}_{1}', matrix.cibw_buildlinux, matrix.cibw_arch) }} @@ -230,7 +230,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_BUILD: ${{ format('pp3*-{0}_{1}', matrix.cibw_buildlinux, matrix.cibw_arch) }} diff --git a/.github/workflows/wheels-pillow_heif.yml b/.github/workflows/wheels-pillow_heif.yml index 7ab0da52..863d643a 100644 --- a/.github/workflows/wheels-pillow_heif.yml +++ b/.github/workflows/wheels-pillow_heif.yml @@ -68,7 +68,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_ARCHS: "AMD64" @@ -95,7 +95,7 @@ jobs: - uses: actions/checkout@v4 - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_ARCHS: "x86_64" @@ -164,7 +164,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_BUILD: ${{ format('cp3*-{0}_{1}', matrix.cibw_buildlinux, matrix.cibw_arch) }} @@ -228,7 +228,7 @@ jobs: - name: Run cibuildwheel run: | - python3 -m pip install cibuildwheel==2.16.2 + python3 -m pip install cibuildwheel==2.17.0 python3 -m cibuildwheel env: CIBW_BUILD: ${{ format('pp3*-{0}_{1}', matrix.cibw_buildlinux, matrix.cibw_arch) }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 44fa63af..bd91bf3e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ This release contains breaking change for monochrome images. ### Changed - `convert_hdr_to_8bit` value now ignores `monochrome` images. #215 -- `subsampling` parameter for encoding has higher priority then `chroma`. #213 +- `subsampling` parameter for encoding has higher priority than `chroma`. #213 - Minimum required `libehif` version is `1.17.0`. #214 - Minimum supported Pillow version raised to `9.5.0`. #216 diff --git a/ci/cirrus_wheels.yml b/ci/cirrus_wheels.yml index 7fffe401..c3f9dabc 100644 --- a/ci/cirrus_wheels.yml +++ b/ci/cirrus_wheels.yml @@ -16,7 +16,7 @@ wheel_macos_arm_task: - brew install python@3.10 - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python install_cibuildwheel_script: - - python3 -m pip install cibuildwheel==2.16.2 + - python3 -m pip install cibuildwheel==2.17.0 run_cibuildwheel_script: - python3 -m cibuildwheel wheels_artifacts: @@ -40,7 +40,7 @@ wheel_pi_heif_macos_arm_task: - brew install python@3.10 - ln -s python3 /opt/homebrew/opt/python@3.10/bin/python install_cibuildwheel_script: - - python3 -m pip install cibuildwheel==2.16.2 + - python3 -m pip install cibuildwheel==2.17.0 transform_to_pi_heif_script: - cp -r -v ./pi-heif/* . - python3 .github/transform_to-pi_heif.py diff --git a/libheif/linux_build_libs.py b/libheif/linux_build_libs.py index db94ed0f..d7fb524a 100644 --- a/libheif/linux_build_libs.py +++ b/libheif/linux_build_libs.py @@ -6,7 +6,7 @@ from re import IGNORECASE, MULTILINE, match, search from subprocess import DEVNULL, PIPE, STDOUT, CalledProcessError, TimeoutExpired, run -# 0 +# 1 BUILD_DIR = environ.get("BUILD_DIR", "/tmp/ph_build_stuff") INSTALL_DIR_LIBS = environ.get("INSTALL_DIR_LIBS", "/usr") PH_LIGHT_VERSION = sys.maxsize <= 2**32 or getenv("PH_LIGHT_ACTION", "0") != "0"