From 9d167d90bb8194f598a87aaa73ad0fd3cee1e48b Mon Sep 17 00:00:00 2001 From: Aleksandr Karpinskii Date: Tue, 10 Sep 2024 18:46:41 +0400 Subject: [PATCH] install pyheif from pypi --- .github/workflows/Check.yml | 15 +++++---------- Makefile | 10 +++++----- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.github/workflows/Check.yml b/.github/workflows/Check.yml index 53f88d0..a513a65 100644 --- a/.github/workflows/Check.yml +++ b/.github/workflows/Check.yml @@ -2,7 +2,7 @@ on: [push] jobs: check: - name: py${{ matrix.python }} pillow-${{ matrix.pillow }} libheif-${{ matrix.libheif }} pyheif-${{ matrix.pyheif }} + name: py${{ matrix.python }} pillow-${{ matrix.pillow }} libheif-${{ matrix.libheif }} no-binary-${{ matrix.no-binary }} runs-on: ubuntu-20.04 timeout-minutes: 3 strategy: @@ -10,12 +10,12 @@ jobs: python: ['3.8', '3.11'] pillow: [prod, latest] libheif: ['1.16.2-6ee6762-3f6b709', '1.18.2-bf35e9e-47f4fc0'] - pyheif: ['', '0.8.0'] + no-binary: ['pyheif', ':none:'] exclude: - python: '3.11' - pyheif: '0.8.0' + no-binary: ':none:' - libheif: '1.18.2-bf35e9e-47f4fc0' - pyheif: '0.8.0' + no-binary: ':none:' steps: - uses: actions/checkout@v2 @@ -32,12 +32,7 @@ jobs: - name: Update pip run: pip install pip==23.2.1 - name: Install dependencies - run: make install-pillow-${{ matrix.pillow }} - - name: Install ovsolete pyheif - if: ${{ matrix.pyheif }} - run: | - pip uninstall -y pyheif - pip install pyheif==${{ matrix.pyheif }} + run: make install-pillow-${{ matrix.pillow }} no-binary=${{ no-binary }} - name: Check run: make check - name: Upload coverage to Codecov diff --git a/Makefile b/Makefile index 4b3d6b7..035b61b 100644 --- a/Makefile +++ b/Makefile @@ -24,14 +24,14 @@ docker_build: docker_shell: docker_build docker run --platform=linux/amd64 --rm -it -v .:/src heif-image-plugin:latest +no-binary ?= pyheif + .PHONY: install-pillow-latest install-pillow-latest: - pip install .[test] \ - git+https://github.com/carsales/pyheif.git@release-0.8.0#egg=pyheif + pip install --no-binary $(no-binary) .[test] .PHONY: install-pillow-prod install-pillow-prod: - pip install .[test] \ + pip install --no-binary $(no-binary) .[test] \ ./pip-stubs/pillow \ - git+https://github.com/uploadcare/pillow-simd.git@simd/9.5-png-truncated#egg=pillow-simd \ - git+https://github.com/carsales/pyheif.git@release-0.8.0#egg=pyheif + git+https://github.com/uploadcare/pillow-simd.git@simd/9.5-png-truncated#egg=pillow-simd