- Add support for building arm64 wheels on macOS

4 files changed, 84 insertions, 35 deletions

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 62f6596..c908bac 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -117,9 +117,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       ###
@@ -134,7 +134,7 @@ jobs:
           echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -154,12 +154,39 @@ jobs:
           pip install -U pip
           pip install -U setuptools wheel twine cffi
 
-      - name: Build zope.proxy (Python 3.10 on MacOS)
+      - name: Build zope.proxy (macOS x86_64, Python 3.8+)
         if: >
           startsWith(runner.os, 'Mac')
-          && startsWith(matrix.python-version, '3.10')
+          && !(startsWith(matrix.python-version, 'pypy')
+               || matrix.python-version == '2.7'
+               || matrix.python-version == '3.5'
+               || matrix.python-version == '3.6'
+               || matrix.python-version == '3.7')
         env:
-          _PYTHON_HOST_PLATFORM: macosx-11-x86_64
+          MACOSX_DEPLOYMENT_TARGET: 10.9
+          _PYTHON_HOST_PLATFORM: macosx-10.9-x86_64
+          ARCHFLAGS: -arch x86_64
+        run: |
+          # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
+          # output (pip install uses a random temporary directory, making this difficult).
+          python setup.py build_ext -i
+          python setup.py bdist_wheel
+          # Also install it, so that we get dependencies in the (pip) cache.
+          pip install -U 'faulthandler; python_version == "2.7" and platform_python_implementation == "CPython"'
+          pip install .[test]
+
+      - name: Build zope.proxy (macOS arm64, Python 3.8+)
+        if: >
+          startsWith(runner.os, 'Mac')
+          && !(startsWith(matrix.python-version, 'pypy')
+               || matrix.python-version == '2.7'
+               || matrix.python-version == '3.5'
+               || matrix.python-version == '3.6'
+               || matrix.python-version == '3.7')
+        env:
+          MACOSX_DEPLOYMENT_TARGET: 11.0
+          _PYTHON_HOST_PLATFORM: macosx-11.0-arm64
+          ARCHFLAGS: -arch arm64
         run: |
           # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
           # output (pip install uses a random temporary directory, making this difficult).
@@ -172,7 +199,11 @@ jobs:
       - name: Build zope.proxy (all other versions)
         if: >
           !startsWith(runner.os, 'Mac')
-          || !startsWith(matrix.python-version, '3.10')
+          || startsWith(matrix.python-version, 'pypy')
+          || matrix.python-version == '2.7'
+          || matrix.python-version == '3.5'
+          || matrix.python-version == '3.6'
+          || matrix.python-version == '3.7'
         run: |
           # Next, build the wheel *in place*. This helps ccache, and also lets us cache the configure
           # output (pip install uses a random temporary directory, making this difficult).
@@ -186,8 +217,32 @@ jobs:
         run: |
           ls -l dist
           twine check dist/*
-      - name: Upload zope.proxy wheel
-        uses: actions/upload-artifact@v2
+      - name: Upload zope.proxy wheel (macOS x86_64)
+        if: >
+          startsWith(runner.os, 'Mac')
+        uses: actions/upload-artifact@v3
+        with:
+          name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
+          path: dist/*x86_64.whl
+      - name: Upload zope.proxy wheel (macOS arm64)
+        if: >
+          startsWith(runner.os, 'Mac')
+          && !(startsWith(matrix.python-version, 'pypy')
+               || matrix.python-version == '2.7'
+               || matrix.python-version == '3.5'
+               || matrix.python-version == '3.6'
+               || matrix.python-version == '3.7')
+        uses: actions/upload-artifact@v3
+        with:
+          # The arm64 wheel is uploaded with a different name just so it can be
+          # manually downloaded when desired. The wheel itself *cannot* be tested
+          # on the GHA runner, which uses x86_64 architecture.
+          name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}-arm64.whl
+          path: dist/*arm64.whl
+      - name: Upload zope.proxy wheel (all other platforms)
+        if: >
+          !startsWith(runner.os, 'Mac')
+        uses: actions/upload-artifact@v3
         with:
           name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/*whl
@@ -233,9 +288,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       ###
@@ -250,7 +305,7 @@ jobs:
           echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -258,7 +313,7 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Download zope.proxy wheel
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
@@ -310,9 +365,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       ###
@@ -327,7 +382,7 @@ jobs:
           echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -335,7 +390,7 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Download zope.proxy wheel
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
@@ -361,9 +416,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       ###
@@ -378,7 +433,7 @@ jobs:
           echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip-${{ matrix.python-version }}
@@ -386,7 +441,7 @@ jobs:
             ${{ runner.os }}-pip-
 
       - name: Download zope.proxy wheel
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: zope.proxy-${{ runner.os }}-${{ matrix.python-version }}.whl
           path: dist/
@@ -414,9 +469,9 @@ jobs:
 
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
       ###
@@ -431,7 +486,7 @@ jobs:
           echo "dir=$(pip cache dir)" >>$GITHUB_OUTPUT
 
       - name: pip cache
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.pip-cache.outputs.dir }}
           key: ${{ runner.os }}-pip_manylinux-${{ matrix.image }}-${{ matrix.python-version }}
@@ -468,14 +523,14 @@ jobs:
           bash .manylinux.sh
 
       - name: Upload zope.proxy wheels
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: wheelhouse/*whl
           name: manylinux_${{ matrix.image }}_wheels.zip
       - name: Restore pip cache permissions
         run: sudo chown -R $(whoami) ${{ steps.pip-cache.outputs.dir }}
       - name: Publish package to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.4.1
+        uses: pypa/gh-action-pypi-publish@release/v1
         if: >
           github.event_name == 'push'
           && startsWith(github.ref, 'refs/tags')
diff --git a/.meta.toml b/.meta.toml
index bea61b9..905e243 100644
--- a/.meta.toml
+++ b/.meta.toml
@@ -2,7 +2,7 @@
 # https://github.com/zopefoundation/meta/tree/master/config/c-code
 [meta]
 template = "c-code"
-commit-id = "b4dd6f9ffd3d6a2cde7dc70512c62d4c7ed22cd6"
+commit-id = "a6a0b3d5c83b07baef36cfa9c298bfa2a906039e"
 
 [python]
 with-appveyor = true
diff --git a/CHANGES.rst b/CHANGES.rst
index cc18f14..456a2ff 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,8 @@
 4.6.1 (unreleased)
 ==================
 
+- Add support for building arm64 wheels on macOS.
+
 
 4.6.0 (2022-11-03)
 ==================
diff --git a/appveyor.yml b/appveyor.yml
index 3c6ec53..68f58e7 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,21 +9,13 @@ environment:
          secure: aoZC/+rvJKg8B5GMGIxd1bg9UDShk28EhfPQFKI9zy7kzygdgj0XuaK619sLe3s4B08bIJaIUAThxEvWq13IvdLb5Oyk8B9qubd+NnDiNuw8WCGy4owYnbl+61fUVVKJIf1ETQyGDooYrEuBo798/+ycQbilTpmncAHZb2KyZkmA210fcWr7OhwmlRtC4IiW7GPCaxU6qhzLlP5pnS2Tl+yy/qx2DiW2fKWqUqynrb1ZMsk6ygN4qV72glTY6wV0eYboAGlghrws1x5+Z10Yug==
 
   matrix:
-    - python: 27
     - python: 27-x64
-    - python: 35
     - python: 35-x64
-    - python: 36
     - python: 36-x64
-    - python: 37
     - python: 37-x64
-    - python: 38
     - python: 38-x64
-    - python: 39
     - python: 39-x64
-    - python: 310
     - python: 310-x64
-    - python: 311
     - python: 311-x64
 
 install: