chore: Update dependencies, including libavif to 1.0.1

fdintino · Sep 11, 2023 · 60556f8 · 60556f8
1 parent ff739ec
commit 60556f8
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 141 deletions.
diff --git a/.github/workflows/macos-install.sh b/.github/workflows/macos-install.sh
@@ -2,7 +2,8 @@
 
 set -e
 
-brew install dav1d aom rav1e cmake
+brew reinstall cmake
+brew install dav1d aom rav1e
 
 if [ "$GHA_PYTHON_VERSION" == "2.7" ]; then
     python2 -m pip install -U tox tox-gh-actions

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,6 @@ jobs:
           "3.9",
           "3.8",
           "3.7",
-          "2.7",
         ]
         include:
         - python-version: "3.7"
@@ -95,78 +94,63 @@ jobs:
         CODECOV_NAME: ${{ matrix.os }} Python ${{ matrix.python-version }}
 
   msys:
-    runs-on: windows-2019
+    runs-on: windows-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        msystem: [ "mingw32", "mingw64" ]
-        python-version: ["2", "3"]
-        include:
-          - msystem: "mingw32"
-            name: "MSYS2 MinGW 32-bit"
-            package: "mingw-w64-i686"
-            env: i686
-          - msystem: "mingw64"
-            name: "MSYS2 MinGW 64-bit"
-            package: "mingw-w64-x86_64"
-            env: x86_64
-        exclude:
-          - msystem: "mingw32"
-            python-version: "2"
-
-    name: ${{ matrix.name }} python ${{ matrix.python-version }}
+    name: MinGW
 
     defaults:
       run:
-        shell: msys2 {0}
+        shell: bash.exe --login -eo pipefail "{0}"
 
     env:
-      MSYSTEM: ${{ matrix.msystem }}
+      MSYSTEM: MINGW64
       CHERE_INVOKING: 1
 
     timeout-minutes: 30
 
     steps:
       - uses: actions/checkout@v3
 
-      - uses: msys2/setup-msys2@v2
-        with:
-          msystem: ${{ matrix.msystem }}
-          update: true
-          install: >-
-            base-devel
-            git
-            ${{ matrix.package }}-toolchain
-            ${{ matrix.package }}-python${{ matrix.python-version }}-pip
-            ${{ matrix.package }}-python${{ matrix.python-version }}-setuptools
-            ${{ matrix.package }}-libjpeg-turbo
-            ${{ matrix.package }}-libtiff
-            ${{ matrix.package }}-libpng
-            ${{ matrix.package }}-openjpeg2
-            ${{ matrix.package }}-libavif
+      - name: Set up shell
+        run: echo "C:\msys64\usr\bin\" >> $env:GITHUB_PATH
+        shell: pwsh
+
+      - name: Install dependencies
+        run: |
+            pacman -S --noconfirm \
+              base-devel \
+              git \
+              mingw-w64-x86_64-gcc \
+              mingw-w64-x86_64-toolchain \
+              mingw-w64-x86_64-python3-pip \
+              mingw-w64-x86_64-python3-setuptools \
+              mingw-w64-x86_64-libjpeg-turbo \
+              mingw-w64-x86_64-libtiff \
+              mingw-w64-x86_64-libpng \
+              mingw-w64-x86_64-openjpeg2 \
+              mingw-w64-x86_64-zlib \
+              mingw-w64-x86_64-libavif
 
       - name: Install Dependencies
         run: |
-          python${{ matrix.python-version }} -m pip install pytest pytest-cov pillow mock
+          python3 -m pip install pytest pytest-cov pillow mock
 
       - name: Build pillow-avif-plugin
-        run: CFLAGS="-coverage" python${{ matrix.python-version }} setup.py build_ext install
+        run: SETUPTOOLS_USE_DISTUTILS="stdlib" CFLAGS="-coverage" python3 -m pip install .
 
       - name: Test pillow-avif-plugin
         run: |
-          python${{ matrix.python-version }} -m pytest -vx --cov pillow_avif --cov tests --cov-report term --cov-report xml tests
+          python3 -m pytest -vx --cov pillow_avif --cov tests --cov-report term --cov-report xml tests
 
       - name: Upload coverage
-        run: |
-          python${{ matrix.python-version }} -m pip install codecov
-          bash <(curl -s https://codecov.io/bash) -F GHA_Windows
-        env:
-          CODECOV_NAME: ${{ matrix.name }}
-
+        uses: codecov/codecov-action@v3
+        with:
+          file: ./coverage.xml
+          flags: GHA_Windows
+          name: "MSYS2 MinGW"
   success:
     needs: [build, msys]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     name: Test Successful
     steps:
       - name: Success

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -20,30 +20,19 @@ jobs:
       matrix:
         os: [ "ubuntu-20.04", "macos-11" ]
         python: [ "2.7", "3.7", "3.8", "3.9", "3.10", "3.11" ]
-        platform: [ "x86_64", "i686" ]
-        manylinux-version: [ "1", "2010" ]
+        platform: [ "x86_64" ]
+        manylinux-version: [ "2010" ]
         macos-target: [ "10.10" ]
         mb-ml-libc: [ "manylinux" ]
         multibuild-sha: [ "34e970c4bc448b73af0127615fc4583b4f247369" ]
         exclude:
-          - os: "macos-11"
-            platform: "i686"
-          - os: "macos-11"
-            manylinux-version: "1"
-          - python: "3.10"
-            manylinux-version: "1"
-          - python: "3.11"
-            manylinux-version: "1"
           - python: "3.11"
             manylinux-version: "2010"
           - python: "3.11"
             multibuild-sha: "34e970c4bc448b73af0127615fc4583b4f247369"
         include:
           - os: "macos-11"
             os-name: "osx"
-          - os: "ubuntu-20.04"
-            manylinux-version: "1"
-            os-name: "manylinux1"
           - os: "ubuntu-20.04"
             manylinux-version: "2010"
             os-name: "manylinux2010"
@@ -136,12 +125,6 @@ jobs:
             os-name: "manylinux2014"
             manylinux-version: "2014"
             multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
-          - python: "3.11"
-            platform: "i686"
-            os: "ubuntu-20.04"
-            os-name: "manylinux2014"
-            manylinux-version: "2014"
-            multibuild-sha: "bb32cfec4f755cb146332a0490abcf3187ce61d1"
     env:
       BUILD_COMMIT: HEAD
       PLAT: ${{ matrix.platform }}
@@ -222,7 +205,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.7", "3.8", "3.9", "3.10", "3.11"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         architecture: ["x64"]
         include:
           - architecture: "x64"

diff --git a/wheelbuild/aom-3.5.0-monochrome-realtime-encode.patch b/wheelbuild/aom-3.5.0-monochrome-realtime-encode.patch
diff --git a/wheelbuild/aom-fix-stack-size.patch b/wheelbuild/aom-fix-stack-size.patch
@@ -68,11 +68,3 @@ index 8d04312..efbed78 100644
  typedef CRITICAL_SECTION pthread_mutex_t;
 
  #if _WIN32_WINNT < 0x0600
-@@ -147,6 +148,7 @@
- #include <sys/builtin.h>  // NOLINT
-
- #define pthread_t TID
-+#define pthread_attr_t int
- #define pthread_mutex_t HMTX
-
- typedef struct {