Skip to content

Commit 989797f

Browse files
authored
Merge pull request #67 from fonttools/update-skia-chrome/m113
Update skia-builder to build skia from chrome/m113 branch
2 parents 6ebb6b8 + 3236c40 commit 989797f

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.github/workflows/ci.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ on:
88
branches: [master]
99

1010
env:
11-
# skip 3.6 on all platforms; only build pypy3 for linux
12-
CIBW_SKIP: cp36-* pp*-macosx_x86_64 pp*-win_amd64
11+
# skip 3.7 on all platforms; only build pypy3 for linux
12+
CIBW_SKIP: cp37-* pp*-macosx_x86_64 pp*-win_amd64
1313
CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
1414
CIBW_MANYLINUX_I686_IMAGE: manylinux2014
1515
CIBW_MANYLINUX_PYPY_X86_64_IMAGE: manylinux2014
@@ -70,9 +70,13 @@ jobs:
7070
strategy:
7171
matrix:
7272
# aarch64 uses qemu so it's slow, build each py version in parallel jobs
73-
python: [37, 38, 39, 310, 311]
73+
python: [38, 39, 310, 311]
7474
arch: [aarch64]
7575
env:
76+
# Skip building aarch64 wheels for musllinux until I figure out why I get
77+
# ImportError: Error relocating ...: __aarch64_cas8_acq_rel: symbol not found
78+
# https://github.com/fonttools/skia-pathops/actions/runs/5143956953/jobs/9259626577#step:6:624
79+
CIBW_SKIP: "*-musllinux*"
7680
CIBW_BUILD: cp${{ matrix.python }}-*
7781
CIBW_ARCHS: ${{ matrix.arch }}
7882
steps:

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ def get_skia_using_pkgconfig():
391391
# "pytest-cython",
392392
],
393393
},
394-
python_requires=">=3.7",
394+
python_requires=">=3.8",
395395
zip_safe=False,
396396
classifiers=[
397397
"Development Status :: 4 - Beta",

src/cpp/skia-builder

tox.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{36,37,38}
2+
envlist = py{38,39,310,311}
33
minversion = 3.0.0
44

55
[testenv]

0 commit comments

Comments
 (0)