v0.1.7

bigcat88 · bigcat88 · commit bf59acdef9af · 2022-02-27T23:41:31.000+02:00
diff --git a/.github/workflows/build-cache-deps.yml b/.github/workflows/build-cache-deps.yml
@@ -13,10 +13,8 @@ jobs:
     name: ${{ matrix.cibw_arch }} • ${{ matrix.cibw_buildlinux }}
     runs-on: ubuntu-20.04
     env:
-      BUILD_STUFF: "/build-stuff"
-      SCRIPTS: "./build_scripts/linux/"
-      BUILD_ORDER: "pkg-config,nasm,libde265,aom,libheif,libffi"
       KEY_HEAD: ${{ matrix.cibw_arch }}-${{ matrix.cibw_buildlinux }}
+      BUILD_DIR_PREFIX: "/tmp/pillow_heif"
 
     steps:
       - uses: actions/checkout@v2
@@ -26,79 +24,40 @@ jobs:
         with:
           platforms: arm64
 
-      - name: Preparations
-        run: |
-          sudo mkdir "$BUILD_STUFF" && sudo chmod 777 "$BUILD_STUFF"
-          echo BUILD_STUFF_CMD="&& sh $(echo "$BUILD_ORDER" | sed 's/,/.sh \&\& sh /g').sh" >> $GITHUB_ENV
-          python3 -m pip install cibuildwheel twine
+      - name: Install cibuildwheel & twine
+        run: python3 -m pip install cibuildwheel twine
 
       - name: manylinux preparations
         if: matrix.cibw_buildlinux == 'manylinux'
-        run: |
-          echo BUILD_COMMAND="yum install -y -q $OS_PACKAGES && set -ex && cd $SCRIPTS $BUILD_STUFF_CMD" >> $GITHUB_ENV
-          echo LDCONFIG_ARG="" >> $GITHUB_ENV
+        run: echo INSTALL_OS_PACKAGES="yum update -y && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
         env:
-          OS_PACKAGES: "wget libtool git-all"
+          OS_PACKAGES: "git-all"
 
       - name: musllinux preparations
         if: matrix.cibw_buildlinux == 'musllinux'
-        run: |
-          echo BUILD_COMMAND="apk --no-cache add -q $OS_PACKAGES && set -ex && cd $SCRIPTS $BUILD_STUFF_CMD" >> $GITHUB_ENV
-          echo LDCONFIG_ARG="/usr/lib" >> $GITHUB_ENV
+        run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
         env:
-          OS_PACKAGES: "sudo py3-pip python3-dev libtool git \
-          freetype-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev tiff-dev zlib-dev"
+          OS_PACKAGES: "sudo py3-pip python3-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
 
       - uses: actions/cache@v2
         with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: pkg-config
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: nasm
+          path: ${{ env.BUILD_DIR_PREFIX }}/build-tools
+          key: ${{ env.KEY_HEAD }}-${{ hashFiles('libheif/*.py') }}
 
       - uses: actions/cache@v2
         with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: libde265
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: aom
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: libheif
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: libffi
+          path: ${{ env.BUILD_DIR_PREFIX }}/build-stuff
+          key: ${{ env.KEY_HEAD }}-${{ hashFiles('libheif/*.*') }}
 
       - name: Start test build
         run: cibuildwheel
         env:
           CIBW_BUILD: ${{ format('cp38-{0}*', matrix.cibw_buildlinux) }}
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
-          CIBW_BEFORE_ALL_LINUX: ${{ env.BUILD_COMMAND }}
-          CIBW_ENVIRONMENT_PASS_LINUX: BUILD_STUFF LDCONFIG_ARG
+          CIBW_BEFORE_ALL_LINUX: ${{ env.INSTALL_OS_PACKAGES }}
+          CIBW_ENVIRONMENT_LINUX: BUILD_DIR_PREFIX=/host${{ env.BUILD_DIR_PREFIX }}
           CIBW_TEST_SKIP: "*"
+          CIBW_BUILD_VERBOSITY: 1
 
       - name: Check builded wheel
         run: twine check wheelhouse/*
@@ -109,3 +68,6 @@ jobs:
           name: wheels
           path: wheelhouse/*.whl
           if-no-files-found: error
+
+      - name: Fix cache permissions
+        run: sudo chmod -R 777 ${{ env.BUILD_DIR_PREFIX }}
diff --git a/.github/workflows/create-release-draft.yml b/.github/workflows/create-release-draft.yml
@@ -82,9 +82,7 @@ jobs:
     name: Wheels • ${{ matrix.cibw_buildlinux }} • ${{ matrix.cibw_arch }}
     runs-on: ubuntu-20.04
     env:
-      BUILD_STUFF: "/build-stuff"
-      SCRIPTS: "./build_scripts/linux/"
-      BUILD_ORDER: "pkg-config,nasm,libde265,aom,libheif,libffi"
+      BUILD_DIR_PREFIX: "/tmp/pillow_heif"
       KEY_HEAD: ${{ matrix.cibw_arch }}-${{ matrix.cibw_buildlinux }}
 
     steps:
@@ -95,80 +93,39 @@ jobs:
         with:
           platforms: arm64
 
-      - name: Preparations
-        run: |
-          sudo mkdir "$BUILD_STUFF" && sudo chmod 777 "$BUILD_STUFF"
-          echo BUILD_STUFF_CMD="&& sh $(echo "$BUILD_ORDER" | sed 's/,/.sh \&\& sh /g').sh" >> $GITHUB_ENV
-          python3 -m pip install cibuildwheel twine
+      - name: Install cibuildwheel & twine
+        run: python3 -m pip install cibuildwheel twine
 
       - name: manylinux preparations
         if: matrix.cibw_buildlinux == 'manylinux'
-        run: |
-          echo BUILD_COMMAND="yum install -y -q $OS_PACKAGES && set -ex && cd $SCRIPTS $BUILD_STUFF_CMD" >> $GITHUB_ENV
-          echo LDCONFIG_ARG="" >> $GITHUB_ENV
+        run: echo INSTALL_OS_PACKAGES="yum update -y && yum install -y $OS_PACKAGES" >> $GITHUB_ENV
         env:
-          OS_PACKAGES: "wget libtool git-all"
+          OS_PACKAGES: "git-all"
 
       - name: musllinux preparations
         if: matrix.cibw_buildlinux == 'musllinux'
-        run: |
-          echo BUILD_COMMAND="apk --no-cache add -q $OS_PACKAGES && set -ex && cd $SCRIPTS $BUILD_STUFF_CMD" >> $GITHUB_ENV
-          echo LDCONFIG_ARG="/usr/lib" >> $GITHUB_ENV
-          echo CIBW_SKIP="cp36-*" >> $GITHUB_ENV
-        env:
-          OS_PACKAGES: "sudo py3-pip python3-dev libtool git \
-          freetype-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev tiff-dev zlib-dev"
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: pkg-config
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
+        run: echo INSTALL_OS_PACKAGES="apk update && apk --no-cache add $OS_PACKAGES" >> $GITHUB_ENV
         env:
-          NAME: nasm
+          OS_PACKAGES: "sudo py3-pip python3-dev fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev"
 
       - uses: actions/cache@v2
         with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: libde265
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: aom
-
-      - uses: actions/cache@v2
-        with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: libheif
+          path: ${{ env.BUILD_DIR_PREFIX }}/build-tools
+          key: ${{ env.KEY_HEAD }}-${{ hashFiles('libheif/*.py') }}
 
       - uses: actions/cache@v2
         with:
-          path: ${{ env.BUILD_STUFF }}/${{ env.NAME }}
-          key: ${{ env.KEY_HEAD }}-${{ hashFiles(format('{0}{1}.sh', env.SCRIPTS, env.NAME)) }}
-        env:
-          NAME: libffi
+          path: ${{ env.BUILD_DIR_PREFIX }}/build-stuff
+          key: ${{ env.KEY_HEAD }}-${{ hashFiles('libheif/*.*') }}
 
       - name: Run cibuildwheel
         run: cibuildwheel
         env:
           CIBW_BUILD: ${{ format('cp3*-{0}*', matrix.cibw_buildlinux) }}
 #          CIBW_SKIP: "cp36-*"
           CIBW_ARCHS: ${{ matrix.cibw_arch }}
-          CIBW_BEFORE_BUILD_LINUX: ${{ env.BUILD_COMMAND }}
-          CIBW_ENVIRONMENT_PASS_LINUX: BUILD_STUFF LDCONFIG_ARG
+          CIBW_BEFORE_ALL_LINUX: ${{ env.INSTALL_OS_PACKAGES }}
+          CIBW_ENVIRONMENT_LINUX: BUILD_DIR_PREFIX=/host${{ env.BUILD_DIR_PREFIX }}
           CIBW_BEFORE_TEST: pip3 install -r requirements_dev.txt
           CIBW_TEST_COMMAND: "pytest -s {project}"
           CIBW_BUILD_VERBOSITY: 2
@@ -183,6 +140,9 @@ jobs:
           path: wheelhouse/*.whl
           if-no-files-found: error
 
+      - name: Fix cache permissions
+        run: sudo chmod -R 777 ${{ env.BUILD_DIR_PREFIX }}
+
   sdist:
     needs: [wheels_linux, wheels_macos]
     name: Source distribution
@@ -214,9 +174,7 @@ jobs:
           python3 -m twine check wheelhouse/*
 
       - name: Generate coverage report
-        run: |
-          cd .. && coverage run --rcfile=pillow_heif/pyproject.toml -m pytest pillow_heif
-          cd - && coverage xml --data-file=../.coverage
+        run: coverage run --rcfile=pyproject.toml -m pytest && coverage xml
 
       - name: Upload report to Codecov
         uses: codecov/codecov-action@v2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.1.7 - 2022-02-27]
+
+### Added
+
+- Added `manylinux2014_i686` wheels.
+- Integration of PEP 517 in progress, added new instructions for building from source.
+
+### Changed
+
+- Making code cleaner, renamed cffi module from `pillow_heif.libheif` to `_pillow_heif_cffi`.
+- libaom bumped from 3.2.0 to 3.3.0
+
+### Fixed
+
+- Fixed `AttributeError` when calling `Image.verify`. Thanks @zijian-hu for reporting.
+
 ## [0.1.6 - 2022-02-10]
 
 ### Added
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # pillow_heif
 
-![static-analysis](https://github.com/bigcat88/pillow_heif/actions/workflows/static-analysis.yml/badge.svg)
+![analysis](https://github.com/bigcat88/pillow_heif/actions/workflows/analysis-coverage.yml/badge.svg)
 ![build](https://github.com/bigcat88/pillow_heif/actions/workflows/create-release-draft.yml/badge.svg)
 ![published](https://github.com/bigcat88/pillow_heif/actions/workflows/publish-pypi.yaml/badge.svg)
 [![codecov](https://codecov.io/gh/bigcat88/pillow_heif/branch/master/graph/badge.svg?token=JY64F2OL6V)](https://codecov.io/gh/bigcat88/pillow_heif)
@@ -17,11 +17,11 @@
 ![Linux](https://img.shields.io/badge/Linux-FCC624?style=for-the-badge&logo=linux&logoColor=black)
 ![Alpine Linux](https://img.shields.io/badge/Alpine_Linux-0078D6.svg?style=for-the-badge&logo=alpine-linux&logoColor=white)
 
-A HEIF/HEIC add-on for Pillow using the `libheif` library via `CFFI`.
+A HEIF/HEIC/AVIF add-on for Pillow using the `libheif` library via `CFFI`.
 
-Binary wheels for Python 3.6-3.10. Linux(+Alpine)/macOS/Windows - x64/aarch64.
+Binary wheels for Python 3.6-3.10. Linux(+Alpine)/macOS/Windows - i686, x86_64 and aarch64.
 
-#### **_Version 0.1.6 was last to support Python 3.6._**
+#### **_Version 0.1.9 will be last to support Python 3.6._**
 
 Mostly based on David Poirier's [pyheif](https://github.com/carsales/pyheif).
 The idea for this plugin came from Christian Bianciotto's [pyheif-pillow-opener](https://github.com/ciotto/pyheif-pillow-opener).
@@ -33,32 +33,48 @@ Pull requests are greatly welcome.
 (Recommended) From [PyPi](https://pypi.org/project/pillow-heif/):
 
 ```bash
-pip install pillow_heif
+pip3 install pillow_heif
 ```
 
 
 ## Installation from source
-**(NOT RECOMMENDED)**(Until finished integration of PEP 517)
+_Instructions are valid for version 0.1.7+_
 
-##### Linux Ubuntu
+### Linux
+
+#### Debian(Ubuntu):
+```bash
+sudo apt install -y python3-pip libtool git cmake
+sudo -H python3 -m pip install --upgrade pip
+sudo -H python3 -m pip install --no-binary pillow_heif
+```
+
+
+#### Alpine:
 ```bash
-sudo add-apt-repository ppa:strukturag/libheif
-apt install libffi libheif-dev libde265-dev
-pip install git+https://github.com/bigcat88/pillow_heif.git
+sudo apk --no-cache add py3-pip python3-dev libtool git gcc m4 perl alpine-sdk cmake
+sudo apk --no-cache add fribidi-dev harfbuzz-dev jpeg-dev lcms2-dev openjpeg-dev
+sudo -H python3 -m pip install --upgrade pip
+sudo -H python3 -m pip install --no-binary pillow_heif
 ```
 
-##### MacOS
+See [build_libs_linux](https://github.com/bigcat88/pillow_heif/blob/master/libheif/build_libs.py) for additional info what will happen during installing from source.
+
+Note: building for first time will take a long time, if in your system `cmake` version `>=3.16.1` is not present.
+
+
+### MacOS
 ```bash
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 brew install x265 libjpeg libde265 libheif
-pip3 install git+https://github.com/bigcat88/pillow_heif.git
+pip3 install --no-binary pillow_heif
 ```
 
-##### Windows
-With vcpkg and Visual Studio 2015+ Tools installed:
+### Windows
 ```bat
 vcpkg install aom libheif --triplet=x64-windows
 VCPKG_PREFIX="path_to:vcpkg/installed/x64-windows"
-pip install git+https://github.com/bigcat88/pillow_heif.git
+pip3 install --no-binary pillow_heif
 ```
 
 ## Example of use as opener
diff --git a/libheif/build.py b/libheif/build.py
@@ -2,26 +2,31 @@
 from sys import platform
 from subprocess import run, DEVNULL, PIPE
 from cffi import FFI
-
-ffi = FFI()
+from libheif import build_libs
 
 
+ffi = FFI()
 with open("libheif/heif.h", "r", encoding="utf-8") as f:
     ffi.cdef(f.read())
 
-
-include_dirs = ["/usr/local/include", "/usr/include", "/opt/local/include"]
-library_dirs = ["/usr/local/lib", "/usr/lib", "/lib", "/opt/local/lib"]
+include_dirs = ["/usr/local/include", "/usr/include"]
+library_dirs = ["/usr/local/lib", "/usr/lib", "/lib"]
 
 include_path_prefix = ""
+insert = False
 if platform.lower() == "darwin":
     include_path_prefix = getenv("HOMEBREW_PREFIX")
     if not include_path_prefix:
         _result = run(["brew", "--prefix"], stderr=DEVNULL, stdout=PIPE, check=False)
         if not _result.returncode and _result.stdout is not None:
             include_path_prefix = _result.stdout.decode("utf-8").rstrip("\n")
+    if not include_path_prefix:
+        include_path_prefix = "/opt/local"
 elif platform.lower() == "win32":
     include_path_prefix = getenv("VCPKG_PREFIX")
+else:
+    include_path_prefix = build_libs.build_libs_linux()
+
 if include_path_prefix:
     include_path_prefix_include = path.join(include_path_prefix, "include")
     if include_path_prefix_include not in include_dirs:
diff --git a/libheif/build_libs.py b/libheif/build_libs.py
diff --git a/pillow_heif/_version.py b/pillow_heif/_version.py
