Merge pull request #50 from fonttools/mac-m1-arm64

Support building mac universal2 wheels

Author: anthrotype

.github/workflows/ci.yml

@@ -7,33 +7,36 @@ on:
   pull_request:
     branches: [master]
 
+env:
+  # skip 3.6 on all platforms; only build pypy3 for linux
+  CIBW_SKIP: cp36-* 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
+  CIBW_TEST_EXTRAS: testing
+  CIBW_TEST_COMMAND: pytest {project}/tests
+  BUILD_SKIA_FROM_SOURCE: 0
+  SKIA_LIBRARY_DIR: "build/download"
+  CIBW_ENVIRONMENT: BUILD_SKIA_FROM_SOURCE=0 SKIA_LIBRARY_DIR=build/download
+
 jobs:
   build:
-
     runs-on: ${{ matrix.os }}
+    env:
+      CIBW_ARCHS: ${{ matrix.arch }}
     defaults:
       run:
         shell: bash
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "pypy3.7-7.3.5"]
-        os: [ubuntu-latest, macos-latest]
-        platform: [x64]
-        exclude:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        arch: [auto64]
+        include:
           - os: macos-latest
-            python-version: "pypy3.7-7.3.5"
-    env:
-      REPO_DIR: "."
-      PLAT: "x86_64"
-      UNICODE_WIDTH: 32
-      MB_PYTHON_VERSION: "${{ matrix.python-version }}"
-      MB_ML_VER: 2014
-      DOCKER_TEST_IMAGE: "multibuild/xenial_x86_64"
-      TEST_DEPENDS: "tox"
-      BUILD_SKIA_FROM_SOURCE: 0
-      SKIA_LIBRARY_DIR: "build/download"
-
+            arch: universal2
+          - os: windows-latest
+            arch: x86
     steps:
     - uses: actions/checkout@v2
       with:
@@ -42,40 +45,24 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: "3.x"
-    - name: Set up environment variables
-      run: |
-        if [ "macos-latest" == "${{ matrix.os }}" ]; then
-          echo "TRAVIS_OS_NAME=osx" >> $GITHUB_ENV
-        else
-          echo "TRAVIS_OS_NAME=ubuntu" >> $GITHUB_ENV
-        fi
-        echo "export BUILD_SKIA_FROM_SOURCE=${BUILD_SKIA_FROM_SOURCE}" >> env_vars.sh
-        echo "export SKIA_LIBRARY_DIR=${SKIA_LIBRARY_DIR}" >> env_vars.sh
-    - name: Install virtualenv
-      run: |
-        python -m pip install --upgrade pip
-        pip install virtualenv
     - name: Download pre-compiled libskia
       env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
       run: |
         if [ "$BUILD_SKIA_FROM_SOURCE" == "0" ]; then
           pip install githubrelease
-          python ci/download_libskia.py -d "${SKIA_LIBRARY_DIR}"
+          if ! [[ $CIBW_ARCHS =~ ^auto ]]; then
+            cpu_arch="--cpu-arch=$CIBW_ARCHS"
+          fi
+          python ci/download_libskia.py -d "${SKIA_LIBRARY_DIR}" $cpu_arch
         fi
-    - name: Build and Install Wheels
-      run: |
-        source multibuild/common_utils.sh
-        source multibuild/travis_steps.sh
-        echo "------- BEFORE INSTALL --------"
-        before_install
-        echo "------- BUILD WHEEL --------"
-        build_wheel $REPO_DIR $PLAT
-        echo "------- INSTALL_RUN --------"
-        install_run $PLAT
+    - name: Install dependencies
+      run: pip install cibuildwheel
+    - name: Build and Test Wheels
+      run: python -m cibuildwheel --output-dir wheelhouse
     - uses: actions/upload-artifact@v2
       with:
-        name: skia_pathops-${{ env.TRAVIS_OS_NAME }}-${{ matrix.python-version }}
+        name: skia_pathops-${{ matrix.os }}-${{ matrix.arch }}
         path: wheelhouse/*.whl
 
   deploy:

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "multibuild"]
-	path = multibuild
-	url = https://github.com/matthew-brett/multibuild/
 [submodule "src/cpp/skia-builder"]
 	path = src/cpp/skia-builder
 	url = https://github.com/fonttools/skia-builder

appveyor.yml

@@ -6,6 +6,7 @@
 import shutil
 import struct
 import tempfile
+from distutils.util import get_platform
 
 __requires__ = ["github_release"]
 
@@ -15,8 +16,18 @@
 GITHUB_REPO = "fonttools/skia-builder"
 ASSET_TEMPLATE = "libskia-{plat}-{arch}.zip"
 DOWNLOAD_DIR = os.path.join("build", "download")
-CPU_ARCH = "x64" if struct.calcsize("P") * 8 == 64 else "x86"
+
 PLATFORM_TAGS = {"Linux": "linux", "Darwin": "mac", "Windows": "win"}
+CURRENT_PLATFORM = PLATFORM_TAGS.get(platform.system())
+SUPPORTED_CPU_ARCHS = {
+    "linux": {"x64"},
+    "mac": {"x64", "arm64", "universal2"},
+    "win": {"x64", "x86"},
+}
+machine = get_platform().split("-")[-1]
+CURRENT_CPU_ARCH = {"win32": "x86", "amd64": "x64", "x86_64": "x64"}.get(
+    machine, machine
+)
 
 
 logger = logging.getLogger()
@@ -57,16 +68,16 @@ def download_unpack_assets(repo, tag, asset_name, dest_dir):
     parser.add_argument(
         "-p",
         "--platform",
-        default=PLATFORM_TAGS.get(platform.system(), "win"),
+        default=CURRENT_PLATFORM,
         choices=["win", "mac", "linux"],
         help="The desired platform (default: %(default)s)",
     )
     parser.add_argument(
         "-a",
         "--cpu-arch",
-        default=CPU_ARCH,
+        default=CURRENT_CPU_ARCH,
         help="The desired CPU architecture (default: %(default)s)",
-        choices=["x86", "x64"],
+        choices=["x86", "x64", "arm64", "universal2"],
     )
     parser.add_argument(
         "-d",
@@ -79,6 +90,11 @@ def download_unpack_assets(repo, tag, asset_name, dest_dir):
     )
     args = parser.parse_args()
 
+    if args.platform is None:
+        parser.error(f"Unsupported platform: {platform.system()}")
+    if args.cpu_arch not in SUPPORTED_CPU_ARCHS[args.platform]:
+        parser.error(f"Unsupported architecture for {args.platform}: {args.cpu_arch}")
+
     tag_name = args.tag_name
     if tag_name is None:
         latest_release = get_latest_release(GITHUB_REPO)