Merge pull request #148 from rougier/update-bundled-ft-and-hb

Update bundled dependencies and tooling
rougier · Apr 25, 2022 · 0084212 · 0084212
2 parents 22e2f96 + da76bec
commit 0084212
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 27 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,35 +20,26 @@ jobs:
       matrix:
         include:
         - os: ubuntu-latest
-          cibw_build: "cp36-*"
+          cibw_build: "cp37-*"
           cibw_archs_linux: "auto64"
           cibw_archs_macos: "auto64"
         - os: windows-latest
-          cibw_build: "cp36-*"
+          cibw_build: "cp37-*"
           cibw_archs_linux: "auto64"
           cibw_archs_macos: "auto64"
-        - os: macos-latest
-          cibw_build: "cp36-*"
-          cibw_archs_linux: "auto64"
-          cibw_archs_macos: "auto64"
-        - os: macos-latest
-          cibw_build: "cp38-macosx_arm64"
-          cibw_archs_linux: "auto64"
-          cibw_archs_macos: "arm64"
-          name: '(arm64)'
         - os: macos-latest
           cibw_build: "cp38-macosx_universal2"
           cibw_archs_linux: "auto64"
           cibw_archs_macos: "universal2"
           name: '(universal2)'
         - os: 'ubuntu-latest'
-          cibw_build: "cp36-manylinux*"
+          cibw_build: "cp37-manylinux*"
           cibw_archs_linux: 'aarch64'
           cibw_archs_macos: "auto64"
           name: '(manylinux aarch64)'
           qemu: true
         - os: 'ubuntu-latest'
-          cibw_build: "cp36-musllinux*"
+          cibw_build: "cp37-musllinux*"
           cibw_archs_linux: 'aarch64'
           cibw_archs_macos: "auto64"
           name: '(musllinux aarch64)'
@@ -65,14 +56,14 @@ jobs:
         platforms: all
 
     - name: Build wheels
-      uses: pypa/cibuildwheel@v2.2.2
+      uses: pypa/cibuildwheel@v2.4.0
       env:
         CIBW_BUILD: ${{ matrix.cibw_build }}
         CIBW_ARCHS: "auto64"
         CIBW_ARCHS_MACOS: ${{ matrix.cibw_archs_macos }}
         CIBW_ARCHS_LINUX: ${{ matrix.cibw_archs_linux }}
         CIBW_ENVIRONMENT: "FREETYPEPY_BUNDLE_FT=yes PYTHON_ARCH=64"
-        CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
+        CIBW_MANYLINUX_X86_64_IMAGE: manylinux2010
         CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014
         CIBW_TEST_COMMAND: "pytest {project}/tests"
         CIBW_TEST_REQUIRES: "pytest"

diff --git a/.gitmodules b/.gitmodules
diff --git a/setup-build-freetype.py b/setup-build-freetype.py
@@ -18,22 +18,21 @@
 import subprocess
 import sys
 import tarfile
-import urllib
+import urllib.request
 from os import path
-from urllib.request import urlopen
 import platform
 
 # Needed for the GitHub Actions macOS CI runner, which appears to come without CAs.
 import certifi
 
 FREETYPE_HOST = "https://download.savannah.gnu.org/releases/freetype/"
-FREETYPE_TARBALL = "freetype-2.11.0.tar.xz"
+FREETYPE_TARBALL = "freetype-2.12.0.tar.xz"
 FREETYPE_URL = FREETYPE_HOST + FREETYPE_TARBALL
-FREETYPE_SHA256 = "8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7"
-HARFBUZZ_HOST = "https://www.freedesktop.org/software/harfbuzz/release/"
-HARFBUZZ_TARBALL = "harfbuzz-2.6.7.tar.xz"
+FREETYPE_SHA256 = "ef5c336aacc1a079ff9262d6308d6c2a066dd4d2a905301c4adda9b354399033"
+HARFBUZZ_HOST = "https://github.com/harfbuzz/harfbuzz/releases/download/4.2.1/"
+HARFBUZZ_TARBALL = "harfbuzz-4.2.1.tar.xz"
 HARFBUZZ_URL = HARFBUZZ_HOST + HARFBUZZ_TARBALL
-HARFBUZZ_SHA256 = "49e481d06cdff97bf68d99fa26bdf785331f411614485d892ea4c78eb479b218"
+HARFBUZZ_SHA256 = "bd17916513829aeff961359a5ccebba6de2f4bf37a91faee3ac29c120e3d7ee1"
 
 root_dir = "."
 build_dir = path.join(root_dir, "build")
@@ -71,7 +70,7 @@
 if sys.platform == "darwin":
     print("# Making a 64 bit build.")
     CMAKE_GLOBAL_SWITCHES += (
-        '-DCMAKE_OSX_ARCHITECTURES="x86_64" '
+        '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" '
         '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.9" '
         '-DCMAKE_C_FLAGS="-O2" '
         '-DCMAKE_CXX_FLAGS="-O2" '

diff --git a/setup.py b/setup.py
@@ -108,7 +108,7 @@ def build_extension(self, ext):
     author='Nicolas P. Rougier',
     author_email='[email protected]',
     url='https://github.com/rougier/freetype-py',
-    python_requires=">=3.6",
+    python_requires=">=3.7",
     packages=['freetype', 'freetype.ft_enums'],
     ext_modules=ext_modules,
     zip_safe=False if ext_modules else True,