Merge pull request #67 from fonttools/update-skia-chrome/m113

Update skia-builder to build skia from chrome/m113 branch
fonttools · Jun 1, 2023 · 989797f · 989797f
2 parents 6ebb6b8 + 3236c40
commit 989797f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,8 +8,8 @@ on:
     branches: [master]
 
 env:
-  # skip 3.6 on all platforms; only build pypy3 for linux
-  CIBW_SKIP: cp36-* pp*-macosx_x86_64 pp*-win_amd64
+  # skip 3.7 on all platforms; only build pypy3 for linux
+  CIBW_SKIP: cp37-* pp*-macosx_x86_64 pp*-win_amd64
   CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
   CIBW_MANYLINUX_I686_IMAGE: manylinux2014
   CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
@@ -70,9 +70,13 @@ jobs:
     strategy:
       matrix:
         # aarch64 uses qemu so it's slow, build each py version in parallel jobs
-        python: [37, 38, 39, 310, 311]
+        python: [38, 39, 310, 311]
         arch: [aarch64]
     env:
+      # Skip building aarch64 wheels for musllinux until I figure out why I get
+      # ImportError: Error relocating ...: __aarch64_cas8_acq_rel: symbol not found
+      # https://github.com/fonttools/skia-pathops/actions/runs/5143956953/jobs/9259626577#step:6:624
+      CIBW_SKIP: "*-musllinux*"
       CIBW_BUILD: cp${{ matrix.python }}-*
       CIBW_ARCHS: ${{ matrix.arch }}
     steps:

diff --git a/setup.py b/setup.py
@@ -391,7 +391,7 @@ def get_skia_using_pkgconfig():
             # "pytest-cython",
         ],
     },
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     zip_safe=False,
     classifiers=[
         "Development Status :: 4 - Beta",

diff --git a/src/cpp/skia-builder b/src/cpp/skia-builder
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36,37,38}
+envlist = py{38,39,310,311}
 minversion = 3.0.0
 
 [testenv]