Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update libheif to 1.19.5 version #312

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 18 additions & 4 deletions .github/workflows/analysis-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:

jobs:
analysis:
runs-on: macos-12
runs-on: macos-13
name: Analysis

steps:
Expand All @@ -31,6 +31,9 @@ jobs:
with:
python-version: '3.12'

- name: Install Libheif
run: brew install libheif

- name: Install from source
run: python3 -m pip install ".[dev]" wheel setuptools

Expand Down Expand Up @@ -130,8 +133,8 @@ jobs:
verbose: true

coverage-macos:
runs-on: macos-12
name: Coverage(macOS) • 🐍3.10
runs-on: macos-13
name: Coverage(macOS-13) • 🐍3.10
env:
TEST_DECODE_THREADS: 0 # This test fails on GitHub on macOS. We have such enabled test on Cirrus.

Expand All @@ -143,6 +146,7 @@ jobs:

- name: Install from source
run: |
brew install --formula ./libheif/macos/libheif.rb
python3 -m pip -v install ".[dev]"

- name: LibHeif info
Expand Down Expand Up @@ -176,6 +180,9 @@ jobs:
with:
python-version: '3.11'

- name: Workaround for pkg-config
run: brew link --overwrite pkgconf

- name: Install from source
run: |
brew install --formula ./libheif/macos/libheif.rb
Expand Down Expand Up @@ -366,11 +373,18 @@ jobs:
run: sudo -H PH_LIGHT_ACTION=1 EXP_PH_LIBHEIF_VERSION="" python3 -m pytest

coverage-import-error:
runs-on: macos-12
runs-on: macos-13
name: Coverage(ImportError)

steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'

- name: Install Libheif
run: brew install libheif

- name: Install from source
run: |
python3 -m pip -v install .
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test-src-build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ jobs:
matrix:
arch: ["amd64", "arm64"]
docker_file: ["Alpine_3_19", "Alpine_3_20", "Almalinux_9", "Debian_12"]
include:
- arch: "amd64"
docker_file: "Archlinux"
- arch: "amd64"
docker_file: "Fedora_39"
# include:
# - arch: "amd64"
# docker_file: "Archlinux"
# - arch: "amd64"
# docker_file: "Fedora_39"

steps:
- uses: actions/checkout@v4
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/test-src-build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ concurrency:
cancel-in-progress: true

jobs:
full_macos_12:
name: macOS:12-x86_64
runs-on: macos-12
full_macos_13:
name: macOS:13-x86_64
runs-on: macos-13
env:
TEST_DECODE_THREADS: 0 # This test fails on GitHub on macOS. We have such enabled test on Cirrus.
PH_FULL_ACTION: 1
Expand Down Expand Up @@ -65,6 +65,9 @@ jobs:
with:
python-version: '3.12'

- name: Workaround for pkg-config
run: brew link --overwrite pkgconf

- name: Install libheif from formula
run: |
brew uninstall --force --ignore-dependencies imagemagick libheif
Expand All @@ -79,9 +82,9 @@ jobs:
- name: Perform tests
run: python3 -m pytest

lite_macos_12:
name: macOS:12-x86_64(Pi-Heif)
runs-on: macos-12
lite_macos_13:
name: macOS:13-x86_64(Pi-Heif)
runs-on: macos-13
env:
TEST_DECODE_THREADS: 0
PH_LIGHT_ACTION: 1
Expand Down Expand Up @@ -121,6 +124,9 @@ jobs:
with:
python-version: '3.12'

- name: Workaround for pkg-config
run: brew link --overwrite pkgconf

- name: Transform to Pi-Heif
run: |
cp -r -v ./pi-heif/* .
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/wheels-pi_heif.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
cp -r -v ./pi-heif/* .
python3 .github/transform_to-pi_heif.py

- name: Workaround for pkg-config
run: brew link --overwrite pkgconf

- name: Install libheif from formula
run: |
brew uninstall --force --ignore-dependencies imagemagick libheif x265 aom
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/wheels-pillow_heif.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ jobs:
with:
python-version: '3.12'

- name: Workaround for pkg-config
run: brew link --overwrite pkgconf

- name: Install libheif from formula
run: |
brew uninstall --force --ignore-dependencies imagemagick libheif
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
All notable changes to this project will be documented in this file.

## [0.21.0 - 2024-1x-xx]

### Changed

- libheif updated from `1.18.2` to `1.19.3` version.

## [0.20.0 - 2024-10-19]

### Added
Expand Down
1 change: 0 additions & 1 deletion docker/from_src/Alpine_3_19.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.19 as base

Check warning on line 1 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

RUN \
apk add --no-cache \
Expand All @@ -9,11 +9,10 @@
nasm \
aom-dev \
x265-dev \
libde265-dev \
py3-numpy \
py3-pillow

FROM base as build_test

Check warning on line 15 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 15 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 15 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 15 in docker/from_src/Alpine_3_19.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_19-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY . /pillow_heif

Expand Down
7 changes: 6 additions & 1 deletion docker/from_src/Alpine_3_20.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,26 @@
FROM alpine:3.20 as base

Check warning on line 1 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 1 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

RUN \
apk add --no-cache \
python3-dev \
py3-pip \
alpine-sdk \
libheif-dev \
cmake \
nasm \
aom-dev \
x265-dev \
libde265-dev \
py3-numpy \
py3-pillow

FROM base as build_test

Check warning on line 16 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 16 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-amd64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 16 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

Check warning on line 16 in docker/from_src/Alpine_3_20.Dockerfile

View workflow job for this annotation

GitHub Actions / Alpine_3_20-arm64

The 'as' keyword should match the case of the 'from' keyword

FromAsCasing: 'as' and 'FROM' keywords' casing do not match More info: https://docs.docker.com/go/dockerfile/rule/from-as-casing/

COPY . /pillow_heif

RUN \
python3 -m venv --system-site-packages myenv && \
source myenv/bin/activate && \
python3 pillow_heif/libheif/linux_build_libs.py && \
if [ `getconf LONG_BIT` = 64 ]; then \
python3 -m pip install -v "pillow_heif/.[tests]"; \
else \
Expand Down
Loading
Loading