Merge pull request aleaxit#470 from skirpichev/try-macos-13

Use macos-14 to build and test arm64 wheels

Author: casevh

.github/workflows/build_wheels.yml

@@ -8,56 +8,35 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest]
-
+        os: [ubuntu-22.04, macos-12, macos-14]
     steps:
-      - uses: actions/checkout@v3
-
+      - uses: actions/checkout@v4
+      - if: runner.os == 'macOS'
+        run: brew install pipx
       - name: Build wheels
-        uses: pypa/[email protected].0
+        uses: pypa/[email protected].5
         env:
           CIBW_PRERELEASE_PYTHONS: True
           CIBW_SKIP: pp*
-          CIBW_BEFORE_BUILD: bash scripts/before_ci_build.sh
+          CIBW_BEFORE_BUILD: bash scripts/cibw_before_all.sh
           CIBW_TEST_EXTRAS: tests
+          CIBW_TEST_SKIP: cp38-macosx_arm64
           CIBW_TEST_COMMAND: >
             pytest {package}/test/ &&
             python {package}/test_cython/runtests.py
-          CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
-            bash scripts/repair_ci_wheel.sh {dest_dir} {wheel}
-          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-            bash scripts/repair_ci_wheel.sh {dest_dir} {wheel} {delocate_archs}
-
-      - uses: actions/upload-artifact@v3
+          CIBW_REPAIR_WHEEL_COMMAND: >
+            bash scripts/cibw_repair_wheel_command.sh {dest_dir} {wheel}
+      - uses: actions/upload-artifact@v4
         with:
-          name: wheels
-          path: ./wheelhouse
-
-  build_wheels_macos_arm64:
-    name: Build wheel on ${{ matrix.os }} arm64
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [macos-12]
-
+          name: wheels-${{ matrix.os }}
+          path: ./wheelhouse/
+  merge:
+    runs-on: ubuntu-22.04
+    needs: build_wheels
     steps:
-      - uses: actions/checkout@v3
-
-      - name: Build wheel
-        uses: pypa/[email protected]
-        env:
-          CIBW_PRERELEASE_PYTHONS: True
-          CIBW_BEFORE_BUILD: bash scripts/before_ci_build_apple_silicon.sh
-          CIBW_SKIP: pp*
-          CIBW_ARCHS_MACOS: arm64
-          CIBW_TEST_EXTRAS: tests
-          CIBW_TEST_COMMAND: >
-            pytest {package}/test/ &&
-            python {package}/test_cython/runtests.py
-          CIBW_REPAIR_WHEEL_COMMAND_MACOS: >
-            bash scripts/repair_ci_wheel.sh {dest_dir} {wheel} {delocate_archs}
-
-      - uses: actions/upload-artifact@v3
+      - name: Merge Wheels
+        uses: actions/upload-artifact/merge@v4
         with:
           name: wheels
-          path: ./wheelhouse
+          pattern: wheels-*
+          delete-merged: true

.github/workflows/pip_install_gmpy2.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
           allow-prereleases: true
@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install Libs
@@ -70,7 +70,7 @@ jobs:
           gcov_include: src/*.c
           gcov_args: --no-external
       - name: Archive build artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: matrix.python-version == 3.11
         with:
           path: |
@@ -89,7 +89,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
         name: Setup msys2
         with:

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ['setuptools>=61', 'wheel', 'build']
+requires = ['setuptools>=61']
 build-backend = 'setuptools.build_meta'
 
 [project]

scripts/before_ci_build.sh

@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -e -x
+
+GMP_VERSION=6.3.0
+MPFR_VERSION=4.2.1
+MPC_VERSION=1.3.1
+
+PREFIX="$(pwd)/.local/"
+
+# -- build GMP --
+curl -s -O https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz
+tar -xf gmp-${GMP_VERSION}.tar.xz
+cd gmp-${GMP_VERSION}
+# config.guess uses microarchitecture and configfsf.guess doesn't
+# We replace config.guess with configfsf.guess to avoid microarchitecture
+# specific code in common code.
+rm config.guess && mv configfsf.guess config.guess && chmod +x config.guess
+./configure --enable-fat \
+            --enable-shared \
+            --disable-static \
+            --prefix=$PREFIX
+make -j6
+make install
+cd ../
+
+# -- build MPFR --
+curl -s -O https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VERSION}.tar.gz
+tar -xf mpfr-${MPFR_VERSION}.tar.gz
+cd mpfr-${MPFR_VERSION}
+./configure --enable-shared \
+            --disable-static \
+            --with-gmp=$PREFIX \
+            --prefix=$PREFIX
+make -j6
+make install
+cd ../
+# -- build MPC --
+curl -s -O https://ftp.gnu.org/gnu/mpc/mpc-${MPC_VERSION}.tar.gz
+tar -xf mpc-${MPC_VERSION}.tar.gz
+cd mpc-${MPC_VERSION}
+./configure --enable-shared \
+            --disable-static \
+            --with-gmp=$PREFIX \
+            --with-mpfr=$PREFIX \
+            --prefix=$PREFIX
+make -j6
+make install
+cd ../
+
+# -- copy headers --
+cp $PREFIX/include/{gmp,mpfr,mpc}.h gmpy2/

scripts/before_ci_build_apple_silicon.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+DEST_DIR=$1
+WHEEL=$2
+LD_LIBRARY_PATH="$(pwd)/.local/lib:$LD_LIBRARY_PATH"
+
+if [[ "$OSTYPE" == "darwin"* ]]
+then
+  delocate-wheel --lib-sdir ../gmpy2.libs -w ${DEST_DIR} -v ${WHEEL}
+else
+  auditwheel repair -w ${DEST_DIR} ${WHEEL}
+fi

scripts/cibw_before_all.sh

@@ -1,41 +1,19 @@
+import os
 import platform
 from setuptools import setup, Extension
 from setuptools.command.build_ext import build_ext
-import shutil
 from pathlib import Path
 
 ON_WINDOWS = platform.system() == 'Windows'
 _comp_args = ["DSHARED=1"]
 sources = ['src/gmpy2.c']
-winlibs = ['gmp.h','mpfr.h','mpc.h',
-           'gmp.lib','mpfr.lib','mpc.lib',
-           'libgmp-10.dll','libmpfr-6.dll','libmpc-3.dll',
-           'libgcc_s_seh-1.dll','libwinpthread-1.dll']
-
-# Copy the pre-built Windows libraries to the 'gmpy2' directory'.
-# If you're not on Windows, delete the Windows libraries from the 'gmpy2'
-# directory if the they exist.
-src = Path('mingw64') / 'winlibs'
-dst = Path('gmpy2')
-if ON_WINDOWS:
-    for filename in winlibs:
-        try:
-            shutil.copy(src / filename, dst / filename)
-        except(FileNotFoundError):
-            pass
-    # Also copy gmpy2.h and gmpy2.pxd to gmpy2 directory to avoid symlink
-    # issues on Windows.
-    for filename in ['gmpy2.h', 'gmpy2.pxd']:
-        try:
-            shutil.copy(Path('src') / filename, dst / filename)
-        except(FileNotFoundError):
-            pass
+if os.getenv('CIBUILDWHEEL'):
+    include_dirs = [os.path.join(os.path.dirname(__file__), '.local', 'include')]
+    library_dirs = [os.path.join(os.path.dirname(__file__), '.local',
+                                 'bin' if ON_WINDOWS else 'lib')]
 else:
-    for filename in winlibs:
-        try:
-            (dst / filename).unlink()
-        except(FileNotFoundError):
-            pass
+    include_dirs = []
+    library_dirs = []
 
 class Gmpy2Build(build_ext):
     description = "Build gmpy2 with custom build options"
@@ -95,9 +73,9 @@ def build_extensions(self):
 extensions = [
     Extension('gmpy2.gmpy2',
               sources=sources,
-              include_dirs=['./src'] + (['./gmpy2'] if ON_WINDOWS else []),
-              libraries=['mpc','mpfr','gmp'] if ON_WINDOWS else ['mpc','mpfr','gmp','m'],
-              library_dirs=(['./gmpy2'] if ON_WINDOWS else []),
+              include_dirs=include_dirs,
+              libraries=['mpc','mpfr','gmp'],
+              library_dirs=library_dirs,
               extra_compile_args=_comp_args,
               )
 ]