Merge pull request #103 from blink1073/py311-arm64

Build Python 3.11 and MacOS arm64

Author: martinRenou

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  # Set update schedule for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every weekday
+      interval: "weekly"

.github/workflows/build_wheel.yml

@@ -13,12 +13,13 @@ on:
 
 jobs:
   osx:
-    runs-on: macos-latest
+    runs-on: macos-11
 
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10"]
+        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        ARCH: ["x86_64", "arm64"]
 
     env:
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
@@ -27,83 +28,91 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.PYTHON_VERSION }}
 
     - name: Setup xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '11'
+        xcode-version: '13.1.0'
 
     - name: Build wheel
       run: |
+        set -eux
+        pip install delocate
         export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
-        python -m pip wheel . --verbose -w wheelhouse
+        if [ ${{ matrix.ARCH }} == "arm64" ]; then
+          export _PYTHON_HOST_PLATFORM=macosx-11.0-arm64
+          export ARCHFLAGS="-arch arm64"
+          export LIBSODIUM_CONFIG_COMMAND="./configure --host=arm64-apple-darwin"
+          export OPENSSL_CONFIG_COMMAND="perl Configure darwin64-arm64-cc"
+          export DCMAKE_OSX_ARCHITECTURES="arm64"
+        fi
+        python -m pip wheel . --verbose -w wheelhouse_dirty
+        delocate-wheel -w wheelhouse --require-archs=${{ matrix.arch }} -v wheelhouse_dirty/xeus_python-*.whl
 
     - name: List wheels
       run: ls wheelhouse
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: wheelhouse
         path: wheelhouse/xeus_python-*.whl
         if-no-files-found: error
 
   linux:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10"]
+        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     container:
-        image: "quay.io/pypa/manylinux2010_x86_64"
+        image: "quay.io/pypa/manylinux_2_24_x86_64"
 
     steps:
-    # We need checkout v1, as checkout v2 does not work for the manylinux2010 image
-    # See https://github.com/actions/runner/issues/334
     - name: Checkout
-      uses: actions/checkout@v1
+      uses: actions/checkout@v3
 
     - name: Build wheel
       run: |
+        set -eux
         pyver=`echo '${{ matrix.PYTHON_VERSION }}' | tr -d '.'`
         pypath=`echo /opt/python/cp${pyver}-cp${pyver}*/bin`
         export PATH=$pypath:$PATH
         python -m pip wheel --verbose . -w wheelhouse_dirty
-        auditwheel repair wheelhouse_dirty/xeus_python-*.whl --plat manylinux2010_x86_64 -w wheelhouse
+        auditwheel repair wheelhouse_dirty/xeus_python-*.whl --plat manylinux_2_24_x86_64 -w wheelhouse
 
     - name: List wheels
       run: ls wheelhouse
 
     - name: Get wheel name
       run: echo "WHEEL=$(find wheelhouse -type f -iname 'xeus_python-*.whl')" >> $GITHUB_ENV
 
-    # We need upload-artifact v1, same issue as for checkout v2
-    - uses: actions/upload-artifact@v1
+    - uses: actions/upload-artifact@v3
       with:
         name: wheelhouse
         path: ${{ env.WHEEL }}
 
   windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10"]
+        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.PYTHON_VERSION }}
 
@@ -119,7 +128,7 @@ jobs:
     - name: List wheels
       run: ls wheelhouse
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: wheelhouse
         path: wheelhouse/xeus_python-*.whl
@@ -133,7 +142,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu, macos, windows]
-        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10"]
+        PYTHON_VERSION: ["3.7", "3.8", "3.9", "3.10", "3.11"]
         include:
           - PYTHON_VERSION: "3.7"
             os: ubuntu
@@ -147,18 +156,24 @@ jobs:
           - PYTHON_VERSION: "3.10"
             os: ubuntu
             whl: 'xeus_python-*-cp310*linux*.whl'
+          - PYTHON_VERSION: "3.11"
+            os: ubuntu
+            whl: 'xeus_python-*-cp311*linux*.whl'
           - PYTHON_VERSION: "3.7"
             os: macos
-            whl: 'xeus_python-*-cp37*macos*.whl'
+            whl: 'xeus_python-*-cp37*macos*x86_64.whl'
           - PYTHON_VERSION: "3.8"
             os: macos
-            whl: 'xeus_python-*-cp38*macos*.whl'
+            whl: 'xeus_python-*-cp38*macos*x86_64.whl'
           - PYTHON_VERSION: "3.9"
             os: macos
-            whl: 'xeus_python-*-cp39*macos*.whl'
+            whl: 'xeus_python-*-cp39*macos*x86_64.whl'
           - PYTHON_VERSION: "3.10"
             os: macos
-            whl: 'xeus_python-*-cp310*macos*.whl'
+            whl: 'xeus_python-*-cp310*macos*x86_64.whl'
+          - PYTHON_VERSION: "3.11"
+            os: macos
+            whl: 'xeus_python-*-cp311*macos*x86_64.whl'
           - PYTHON_VERSION: "3.7"
             os: windows
             whl: 'xeus_python-*-cp37*win*.whl'
@@ -171,18 +186,21 @@ jobs:
           - PYTHON_VERSION: "3.10"
             os: windows
             whl: 'xeus_python-*-cp310*win*.whl'
+          - PYTHON_VERSION: "3.11"
+            os: windows
+            whl: 'xeus_python-*-cp311*win*.whl'
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: wheelhouse
         path: ./wheelhouse
 
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: ${{ matrix.PYTHON_VERSION }}
 
@@ -212,7 +230,7 @@ jobs:
 
     steps:
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v3
       with:
         name: wheelhouse
         path: ./wheelhouse

CMakeLists.txt

@@ -17,6 +17,8 @@ set(BUILD_SHARED_LIBS OFF CACHE BOOL "disable shared build of xeus" FORCE)
 
 message(STATUS "PYTHON_EXECUTABLE is ${PYTHON_EXECUTABLE}")
 message(STATUS "CMAKE_LIBRARY_PATH is ${CMAKE_LIBRARY_PATH}")
+message(STATUS "OPENSSL_CONFIG is ${OPENSSL_CONFIG}")
+message(STATUS "LIBSODIUM CONFIG is ${LIBSODIUM_CONFIG}")
 
 # Dependencies
 # ============

External_OpenSSL.cmake.in

@@ -28,7 +28,7 @@ if (WIN32)
     set(OPENSSL_POSTINSTALL_SSL_COMMAND ${CMAKE_COMMAND} -E copy libssl_static.lib ${EP_INSTALL_DIR}/lib/libssl_static.lib)
 else()
     set(OPENSSL_PATCH_COMMAND git apply --ignore-space-change --ignore-whitespace ${CMAKE_SOURCE_DIR}/commoncrypto.patch)
-    set(OPENSSL_CONFIG_COMMAND CFLAGS=-fPIC ./config --prefix=${EP_INSTALL_DIR})
+    set(OPENSSL_CONFIG_COMMAND @OPENSSL_CONFIG@ CFLAGS=-fPIC --prefix=${EP_INSTALL_DIR})
     set(OPENSSL_BUILD_COMMAND make -j ${CPU_COUNT})
     if(APPLE)
         set(OPENSSL_INSTALL_COMMAND make install_sw install_ssldirs)

External_libsodium.cmake.in

@@ -19,7 +19,7 @@ endif()
 
 if (WIN32)
 else ()
-    set(LIBSODIUM_CONFIG_COMMAND CFLAGS=-fPIC ./configure --prefix=${EP_INSTALL_DIR})
+    set(LIBSODIUM_CONFIG_COMMAND CFLAGS=-fPIC @LIBSODIUM_CONFIG@ --prefix=${EP_INSTALL_DIR})
     set(LIBSODIUM_BUILD_COMMAND make -j ${CPU_COUNT})
     set(LIBSODIUM_INSTALL_COMMAND make install)
 endif ()

pyproject.toml

@@ -3,6 +3,6 @@ requires = [
   "setuptools",
   "wheel",
   "scikit-build>=0.11.0,<0.14",
-  "cmake",
+  "cmake>=3.4",
   "ninja"
 ]

setup.py

@@ -1,3 +1,4 @@
+import os
 import sys
 
 try:
@@ -60,6 +61,9 @@ def cmake_process_manifest_hook(cmake_manifest):
     return cmake_manifest
 
 
+openssl_config = os.environ.get('OPENSSL_CONFIG_COMMAND', './config')
+libsodium_config = os.environ.get('LIBSODIUM_CONFIG_COMMAND', './configure')
+
 setup(
     name="xeus-python",
     version=xeus_version,
@@ -73,6 +77,7 @@ def cmake_process_manifest_hook(cmake_manifest):
         'xeus-python-shell[ipython]>=0.5,<0.6'
     ],
     setup_requires=setup_requires,
-    cmake_args=['-DCMAKE_INSTALL_LIBDIR=lib', '-DPYTHON_EXECUTABLE:FILEPATH=' + python_path],
+    cmake_args=['-DCMAKE_INSTALL_LIBDIR=lib', '-DPYTHON_EXECUTABLE:FILEPATH=' + python_path, f'-DOPENSSL_CONFIG:INTERNAL={openssl_config}',
+         f'-DLIBSODIUM_CONFIG:INTERNAL="{libsodium_config}"'],
     cmake_process_manifest_hook=cmake_process_manifest_hook
 )