Merge branch 'feature/update-wheel-actions-versions' into develop

ukaea · Dec 17, 2024 · 310a5ae · 310a5ae
2 parents a205aa6 + 22b254e
commit 310a5ae
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 17 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -28,20 +28,20 @@ jobs:
           # which are only executed on push to tag. 
           # Test wheels are also generated for the other platforms (and uploaded to testpypi)
           # on pushes to release branches and to main
-          - [ubuntu-latest, x86_64, manylinux2014_x86_64]
-          - [ubuntu-latest, x86_64, manylinux_2_28_x86_64]
-          - [ubuntu-latest, aarch64, manylinux_2_28_aarch64]
-          - [macos-13, x86_64, macosx_x86_64]
-          - [macos-14, arm64, macosx_arm64]
-          - [windows-latest, AMD64, win_amd64]
+          - [ubuntu-latest, x86_64, manylinux2014_x86_64, 0.0]
+          - [ubuntu-latest, x86_64, manylinux_2_28_x86_64, 0.0]
+          - [ubuntu-latest, aarch64, manylinux_2_28_aarch64, 0.0]
+          - [macos-13, x86_64, macosx_x86_64, 13.0]
+          - [macos-14, arm64, macosx_arm64, 14.0]
+          - [windows-latest, AMD64, win_amd64, 0.0]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         # need git tags available for setuptools_scm to grab tags
         with:
           fetch-depth: 0
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
@@ -107,15 +107,15 @@ jobs:
          
       - name: build windows wheels
         if: runner.OS == 'Windows'
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.22.0
         with:
           package-dir: ${{github.workspace}}/install/python_installer
           config-file: ${{github.workspace}}/install/python_installer/pyproject.toml
         env:
           CIBW_ARCHS: ${{matrix.build-platform[1]}}
           CIBW_PLATFORM: windows
           CIBW_BUILD: cp3*-${{matrix.build-platform[2]}}
-          CIBW_SKIP: cp36* cp37*   
+          CIBW_SKIP: cp36* cp37* cp313*  
           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel} --add-path ${{github.workspace}}/install/lib"
           CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
 
@@ -125,7 +125,7 @@ jobs:
           startswith(matrix.build-platform[2], 'manylinux2014') && 
           github.event_name == 'push' && 
           startsWith(github.ref, 'refs/tags/')
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.22.0
         with:
           package-dir: ./source/wrappers/python
           config-file: ./source/wrappers/python/pyproject.toml
@@ -176,7 +176,7 @@ jobs:
           startswith(matrix.build-platform[2], 'manylinux_2_28') && 
           ! ( startswith(matrix.build-platform[1], 'aarch64') && 
           !startsWith(github.ref, 'refs/tags/') )
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.22.0
         with:
           package-dir: ./source/wrappers/python
           config-file: ./source/wrappers/python/pyproject.toml
@@ -189,7 +189,7 @@ jobs:
           CIBW_BEFORE_ALL: >
             dnf update -y &&
             dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm &&
-            dnf install -y boost-devel openssl-devel libxml2-devel libtirpc-devel 
+            dnf install -y boost1.78-devel openssl-devel libxml2-devel libtirpc-devel 
             fmt fmt-devel spdlog spdlog-devel capnproto capnproto-devel &&
             cd /project &&
             cmake -B build 
@@ -222,18 +222,20 @@ jobs:
           -DCMAKE_INSTALL_PREFIX=$PWD/install
           -DCLIENT_ONLY=ON &&
           cmake --build build -j --config Release --target install &&
-          cp -r $PWD/install/python_installer/* ${{github.workspace}}/source/wrappers/python/ 
+          cp -r $PWD/install/python_installer/* ${{github.workspace}}/source/wrappers/python/
 
       - name: Build macos wheels
         if: runner.os == 'macOS'
-        uses: pypa/cibuildwheel@v2.17.0
+        uses: pypa/cibuildwheel@v2.22.0
         with:
           package-dir: ./source/wrappers/python
           config-file: ./source/wrappers/python/pyproject.toml
         env:
           CIBW_ARCHS: ${{matrix.build-platform[1]}}
           CIBW_PLATFORM: macos
+          CIBW_SKIP: cp313*
           CIBW_BUILD: cp*-${{matrix.build-platform[2]}}
+          MACOSX_DEPLOYMENT_TARGET: ${{matrix.build-platform[3]}}
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/source/cache/CMakeLists.txt b/source/cache/CMakeLists.txt
@@ -24,6 +24,7 @@ set( SRC_FILES
 
 include_directories(
   ${OPENSSL_INCLUDE_DIR}
+  ${Boost_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIR}
   ${CMAKE_SOURCE_DIR}/source
   ${LIBXML2_INCLUDE_DIR}

diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt
@@ -4,6 +4,7 @@
 find_package( OpenSSL REQUIRED )
 find_package( fmt REQUIRED )
 find_package( LibXml2 REQUIRED )
+find_package( Boost REQUIRED )
 
 if( WIN32 OR MINGW )
   find_package( XDR REQUIRED )
@@ -75,6 +76,7 @@ include_directories(
   ${OPENSSL_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${fmt_SOURCE_DIR}/include
+  ${Boost_INCLUDE_DIRS}
 )
 
 add_library( client-objects OBJECT ${SRC_FILES} ${HEADER_FILES} )

diff --git a/source/client2/CMakeLists.txt b/source/client2/CMakeLists.txt
@@ -4,6 +4,7 @@
 find_package( OpenSSL REQUIRED )
 find_package( LibXml2 REQUIRED )
 find_package( fmt REQUIRED )
+find_package( Boost REQUIRED )
 
 if( WIN32 OR MINGW )
   find_package( XDR REQUIRED )
@@ -73,6 +74,7 @@ include_directories(
   ${OPENSSL_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${fmt_SOURCE_DIR}/include
+  ${Boost_INCLUDE_DIRS}
 )
 
 add_library( client2-objects OBJECT ${SRC_FILES} ${HEADER_FILES} )

diff --git a/source/clientserver/CMakeLists.txt b/source/clientserver/CMakeLists.txt
@@ -6,6 +6,7 @@ find_package( fmt REQUIRED )
 if( NOT CLIENT_ONLY )
   find_package( LibXml2 REQUIRED )
 endif()
+find_package( Boost REQUIRED )
 
 if( WIN32 OR MINGW )
   find_package( XDR REQUIRED )
@@ -105,6 +106,7 @@ include_directories(
   ${OPENSSL_INCLUDE_DIR}
   ${LIBXML2_INCLUDE_DIR}
   ${fmt_SOURCE_DIR}/include
+  ${Boost_INCLUDE_DIRS}
 )
 
 if( MINGW OR WIN32 )

diff --git a/source/wrappers/python/pyproject.toml b/source/wrappers/python/pyproject.toml
@@ -1,8 +1,8 @@
 [build-system]
 requires = [
     "setuptools>=42",
-    "oldest-supported-numpy; python_version < '3.13'",
-    "numpy >=1.7, <2; python_version >= '3.13'",
+    "oldest-supported-numpy; python_version < '3.12'",
+    "numpy >=1.7, <2; python_version >= '3.12'",
     "Cython>=0.29",
     "six"
 ]