From a460f40f3748c4d2e61d22eb72a47b8aab839786 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 11:29:38 -0400 Subject: [PATCH 01/12] ENH: Update CI and scikit-build-core --- .github/workflows/wheels.yml | 10 +++++----- pyproject.toml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index a88a1d89..3c7271b8 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -122,22 +122,22 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.16.2 setuptools + run: python -m pip install cibuildwheel==2.18.0 setuptools toml - name: Get package name and version (Linux / Mac) if: ${{ ! startsWith(matrix.os, 'windows-') }} run: | - echo PACKAGE_NAME=$( python setup.py --name ) >> $GITHUB_ENV - echo PACKAGE_VERSION=$( python setup.py --version ) >> $GITHUB_ENV + echo PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" ) >> $GITHUB_ENV + echo PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) >> $GITHUB_ENV # Some shells require "-Encoding utf8" to append to GITHUB_ENV # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions?tool=powershell#environment-files - name: Get package name and version (Windows) if: startsWith(matrix.os, 'windows-') run: | - echo "PACKAGE_NAME=$( python setup.py --name )" | Out-File -FilePath $env:GITHUB_ENV ` + echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" )" | Out-File -FilePath $env:GITHUB_ENV ` -Append - echo "PACKAGE_VERSION=$( python setup.py --version )" | Out-File -FilePath $env:GITHUB_ENV ` + echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append - name: Build wheels env: diff --git a/pyproject.toml b/pyproject.toml index ca46341a..73c6bc49 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["scikit-build-core >=0.4.3", "nanobind >=1.3.2"] +requires = ["scikit-build-core >=0.9.3", "nanobind >=1.3.2"] build-backend = "scikit_build_core.build" [project] From c80964ebbd44b003ba59c0aa00e2d5f3a1793413 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 11:34:45 -0400 Subject: [PATCH 02/12] BUG: Errant quote --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 3c7271b8..1cfc6e2c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -135,7 +135,7 @@ jobs: - name: Get package name and version (Windows) if: startsWith(matrix.os, 'windows-') run: | - echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" )" | Out-File -FilePath $env:GITHUB_ENV ` + echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append From 28213370c261925cfd7c0aa8f55db39207f7765c Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 11:50:22 -0400 Subject: [PATCH 03/12] BUG: Multi-line command fail --- .github/workflows/wheels.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 1cfc6e2c..6b4521d4 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -135,10 +135,8 @@ jobs: - name: Get package name and version (Windows) if: startsWith(matrix.os, 'windows-') run: | - echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" ) | Out-File -FilePath $env:GITHUB_ENV ` - -Append - echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) | Out-File -FilePath $env:GITHUB_ENV ` - -Append + echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append + echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append - name: Build wheels env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 From 9cc32b6d4efd4fc6cdd5f8b209b7313733d9cfc9 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 12:37:22 -0400 Subject: [PATCH 04/12] BUG: quotes again --- .github/workflows/wheels.yml | 134 +++++++++++++++++------------------ 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6b4521d4..ae0871f3 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -19,92 +19,92 @@ jobs: # Need to quote decimal versions as string to avoid the "Norway problem" # Windows 64-bit - - os: windows-latest - python: '3.8' - cibw_python: 38 - platform_id: win_amd64 - - os: windows-latest - python: '3.9' - cibw_python: 39 - platform_id: win_amd64 - - os: windows-latest - python: '3.10' - cibw_python: 310 - platform_id: win_amd64 + # - os: windows-latest + # python: '3.8' + # cibw_python: 38 + # platform_id: win_amd64 + # - os: windows-latest + # python: '3.9' + # cibw_python: 39 + # platform_id: win_amd64 + # - os: windows-latest + # python: '3.10' + # cibw_python: 310 + # platform_id: win_amd64 - os: windows-latest python: '3.11' cibw_python: 311 platform_id: win_amd64 - - os: windows-latest - python: '3.12' - cibw_python: 312 - platform_id: win_amd64 + # - os: windows-latest + # python: '3.12' + # cibw_python: 312 + # platform_id: win_amd64 # Linux 64-bit - - os: ubuntu-latest - python: '3.8' - cibw_python: 38 - platform_id: manylinux_x86_64 - - os: ubuntu-latest - python: '3.9' - cibw_python: 39 - platform_id: manylinux_x86_64 - - os: ubuntu-latest - python: '3.10' - cibw_python: 310 - platform_id: manylinux_x86_64 + # - os: ubuntu-latest + # python: '3.8' + # cibw_python: 38 + # platform_id: manylinux_x86_64 + # - os: ubuntu-latest + # python: '3.9' + # cibw_python: 39 + # platform_id: manylinux_x86_64 + # - os: ubuntu-latest + # python: '3.10' + # cibw_python: 310 + # platform_id: manylinux_x86_64 - os: ubuntu-latest python: '3.11' cibw_python: 311 platform_id: manylinux_x86_64 - - os: ubuntu-latest - python: '3.12' - cibw_python: 312 - platform_id: manylinux_x86_64 + # - os: ubuntu-latest + # python: '3.12' + # cibw_python: 312 + # platform_id: manylinux_x86_64 # macOS on Intel 64-bit - - os: macos-12 - python: '3.8' - cibw_python: 38 - arch: x86_64 - platform_id: macosx_x86_64 - - os: macos-12 - python: '3.9' - cibw_python: 39 - arch: x86_64 - platform_id: macosx_x86_64 - - os: macos-12 - python: '3.10' - cibw_python: 310 - arch: x86_64 - platform_id: macosx_x86_64 + # - os: macos-12 + # python: '3.8' + # cibw_python: 38 + # arch: x86_64 + # platform_id: macosx_x86_64 + # - os: macos-12 + # python: '3.9' + # cibw_python: 39 + # arch: x86_64 + # platform_id: macosx_x86_64 + # - os: macos-12 + # python: '3.10' + # cibw_python: 310 + # arch: x86_64 + # platform_id: macosx_x86_64 - os: macos-12 python: '3.11' cibw_python: 311 arch: x86_64 platform_id: macosx_x86_64 - - os: macos-12 - python: '3.12' - cibw_python: 312 - arch: x86_64 - platform_id: macosx_x86_64 + # - os: macos-12 + # python: '3.12' + # cibw_python: 312 + # arch: x86_64 + # platform_id: macosx_x86_64 # macOS on Apple M1 64-bit, supported for Python 3.10 and later - - os: macos-14 - python: '3.10' - cibw_python: 310 - arch: arm64 - platform_id: macosx_arm64 + # - os: macos-14 + # python: '3.10' + # cibw_python: 310 + # arch: arm64 + # platform_id: macosx_arm64 - os: macos-14 python: '3.11' cibw_python: 311 arch: arm64 platform_id: macosx_arm64 - - os: macos-14 - python: '3.12' - cibw_python: 312 - arch: arm64 - platform_id: macosx_arm64 + # - os: macos-14 + # python: '3.12' + # cibw_python: 312 + # arch: arm64 + # platform_id: macosx_arm64 steps: - uses: actions/checkout@v4 @@ -127,16 +127,16 @@ jobs: - name: Get package name and version (Linux / Mac) if: ${{ ! startsWith(matrix.os, 'windows-') }} run: | - echo PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" ) >> $GITHUB_ENV - echo PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) >> $GITHUB_ENV + echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" )" >> $GITHUB_ENV + echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" )" >> $GITHUB_ENV # Some shells require "-Encoding utf8" to append to GITHUB_ENV # https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions?tool=powershell#environment-files - name: Get package name and version (Windows) if: startsWith(matrix.os, 'windows-') run: | - echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append - echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" ) | Out-File -FilePath $env:GITHUB_ENV ` -Append + echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" )" | Out-File -FilePath $env:GITHUB_ENV ` -Append + echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" )" | Out-File -FilePath $env:GITHUB_ENV ` -Append - name: Build wheels env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 @@ -164,7 +164,7 @@ jobs: fi CIBW_ENVIRONMENT_MACOS: | - CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local + CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local MACOSX_DEPLOYMENT_TARGET=10.14 run: python -m cibuildwheel --output-dir wheelhouse/cp${{ matrix.cibw_python }}-${{matrix.platform_id }} From 116eaf7d70e42fc527e657cfdfbafcb588a9e903 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 13:12:07 -0400 Subject: [PATCH 05/12] ENH: Need to sync MACOSX_DEPLOYMENT_TARGET to runner version --- .github/workflows/wheels.yml | 9 +++++---- pyproject.toml | 8 +------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index ae0871f3..70878703 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -122,7 +122,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.18.0 setuptools toml + run: python -m pip install cibuildwheel==2.16.2 setuptools toml - name: Get package name and version (Linux / Mac) if: ${{ ! startsWith(matrix.os, 'windows-') }} @@ -156,6 +156,10 @@ jobs: python -m pip install cmake ninja setuptools CIBW_ARCHS_MACOS: ${{ matrix.arch }} + + CIBW_ENVIRONMENT_MACOS: | + CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local MACOSX_DEPLOYMENT_TARGET=$( sw_vers -productVersion | awk -F '.' '{print $1".0"}' ) + CIBW_BEFORE_ALL_MACOS: | python -m pip install cmake ninja setuptools brew update @@ -163,9 +167,6 @@ jobs: HOMEBREW_NO_AUTO_UPDATE=1 brew install libpng fi - CIBW_ENVIRONMENT_MACOS: | - CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local MACOSX_DEPLOYMENT_TARGET=10.14 - run: python -m cibuildwheel --output-dir wheelhouse/cp${{ matrix.cibw_python }}-${{matrix.platform_id }} - name: Install and test (Linux / Mac) diff --git a/pyproject.toml b/pyproject.toml index 73c6bc49..87498864 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["scikit-build-core >=0.9.3", "nanobind >=1.3.2"] +requires = ["scikit-build-core >=0.4.3", "nanobind >=1.3.2"] build-backend = "scikit_build_core.build" [project] @@ -54,9 +54,3 @@ build-verbosity = 1 test-command = "pytest {project}/tests" test-requires = "pytest" -# Don't test Python 3.8 wheels on macOS/arm64 -test-skip="cp38-macosx_*:arm64" - -# Needed for full C++17 support -[tool.cibuildwheel.macos.environment] -MACOSX_DEPLOYMENT_TARGET = "10.14" From 51834226970a85177f58e450e120b1670869df85 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 13:19:34 -0400 Subject: [PATCH 06/12] CI: Set OS version --- .github/workflows/wheels.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 70878703..6e9af6e6 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -137,6 +137,13 @@ jobs: run: | echo "PACKAGE_NAME=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['name'])" )" | Out-File -FilePath $env:GITHUB_ENV ` -Append echo "PACKAGE_VERSION=$( python -c "import toml; print(toml.load('pyproject.toml')['project']['version'])" )" | Out-File -FilePath $env:GITHUB_ENV ` -Append + + - name: Determine macOS version + if: startsWith(matrix.os, 'macos-') + run: | + macos_version=$(sw_vers -productVersion | awk -F '.' '{print $1".0"}') + echo "MACOSX_DEPLOYMENT_TARGET=${macos_version}" >> $GITHUB_ENV + - name: Build wheels env: CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014 @@ -158,7 +165,7 @@ jobs: CIBW_ARCHS_MACOS: ${{ matrix.arch }} CIBW_ENVIRONMENT_MACOS: | - CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local MACOSX_DEPLOYMENT_TARGET=$( sw_vers -productVersion | awk -F '.' '{print $1".0"}' ) + CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local CIBW_BEFORE_ALL_MACOS: | python -m pip install cmake ninja setuptools From 5dee4b68705a5f626f46a90750be29c436fceea2 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 14:21:33 -0400 Subject: [PATCH 07/12] ENH: Re-enable other pythons --- .github/workflows/wheels.yml | 124 +++++++++++++++++------------------ 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 6e9af6e6..5d2e2a8f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -19,92 +19,92 @@ jobs: # Need to quote decimal versions as string to avoid the "Norway problem" # Windows 64-bit - # - os: windows-latest - # python: '3.8' - # cibw_python: 38 - # platform_id: win_amd64 - # - os: windows-latest - # python: '3.9' - # cibw_python: 39 - # platform_id: win_amd64 - # - os: windows-latest - # python: '3.10' - # cibw_python: 310 - # platform_id: win_amd64 + - os: windows-latest + python: '3.8' + cibw_python: 38 + platform_id: win_amd64 + - os: windows-latest + python: '3.9' + cibw_python: 39 + platform_id: win_amd64 + - os: windows-latest + python: '3.10' + cibw_python: 310 + platform_id: win_amd64 - os: windows-latest python: '3.11' cibw_python: 311 platform_id: win_amd64 - # - os: windows-latest - # python: '3.12' - # cibw_python: 312 - # platform_id: win_amd64 + - os: windows-latest + python: '3.12' + cibw_python: 312 + platform_id: win_amd64 # Linux 64-bit - # - os: ubuntu-latest - # python: '3.8' - # cibw_python: 38 - # platform_id: manylinux_x86_64 - # - os: ubuntu-latest - # python: '3.9' - # cibw_python: 39 - # platform_id: manylinux_x86_64 - # - os: ubuntu-latest - # python: '3.10' - # cibw_python: 310 - # platform_id: manylinux_x86_64 + - os: ubuntu-latest + python: '3.8' + cibw_python: 38 + platform_id: manylinux_x86_64 + - os: ubuntu-latest + python: '3.9' + cibw_python: 39 + platform_id: manylinux_x86_64 + - os: ubuntu-latest + python: '3.10' + cibw_python: 310 + platform_id: manylinux_x86_64 - os: ubuntu-latest python: '3.11' cibw_python: 311 platform_id: manylinux_x86_64 - # - os: ubuntu-latest - # python: '3.12' - # cibw_python: 312 - # platform_id: manylinux_x86_64 + - os: ubuntu-latest + python: '3.12' + cibw_python: 312 + platform_id: manylinux_x86_64 # macOS on Intel 64-bit - # - os: macos-12 - # python: '3.8' - # cibw_python: 38 - # arch: x86_64 - # platform_id: macosx_x86_64 - # - os: macos-12 - # python: '3.9' - # cibw_python: 39 - # arch: x86_64 - # platform_id: macosx_x86_64 - # - os: macos-12 - # python: '3.10' - # cibw_python: 310 - # arch: x86_64 - # platform_id: macosx_x86_64 + - os: macos-12 + python: '3.8' + cibw_python: 38 + arch: x86_64 + platform_id: macosx_x86_64 + - os: macos-12 + python: '3.9' + cibw_python: 39 + arch: x86_64 + platform_id: macosx_x86_64 + - os: macos-12 + python: '3.10' + cibw_python: 310 + arch: x86_64 + platform_id: macosx_x86_64 - os: macos-12 python: '3.11' cibw_python: 311 arch: x86_64 platform_id: macosx_x86_64 - # - os: macos-12 - # python: '3.12' - # cibw_python: 312 - # arch: x86_64 - # platform_id: macosx_x86_64 + - os: macos-12 + python: '3.12' + cibw_python: 312 + arch: x86_64 + platform_id: macosx_x86_64 # macOS on Apple M1 64-bit, supported for Python 3.10 and later - # - os: macos-14 - # python: '3.10' - # cibw_python: 310 - # arch: arm64 - # platform_id: macosx_arm64 + - os: macos-14 + python: '3.10' + cibw_python: 310 + arch: arm64 + platform_id: macosx_arm64 - os: macos-14 python: '3.11' cibw_python: 311 arch: arm64 platform_id: macosx_arm64 - # - os: macos-14 - # python: '3.12' - # cibw_python: 312 - # arch: arm64 - # platform_id: macosx_arm64 + - os: macos-14 + python: '3.12' + cibw_python: 312 + arch: arm64 + platform_id: macosx_arm64 steps: - uses: actions/checkout@v4 From b430ab9403840f824ba25ac3e9768e7a939f264e Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 18:46:36 -0400 Subject: [PATCH 08/12] BUG: Fix wheels tags --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5d2e2a8f..f7a91583 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -165,7 +165,7 @@ jobs: CIBW_ARCHS_MACOS: ${{ matrix.arch }} CIBW_ENVIRONMENT_MACOS: | - CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local + CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local SYSTEM_VERSION_COMPAT=0 CIBW_BEFORE_ALL_MACOS: | python -m pip install cmake ninja setuptools From 4a661c217633461b28ababf1afd7bfa82586a422 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Tue, 14 May 2024 20:53:22 -0400 Subject: [PATCH 09/12] WIP: Remove SYSTEM_VERSION_COMPAT=0 (its use is for installers) --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index f7a91583..5d2e2a8f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -165,7 +165,7 @@ jobs: CIBW_ARCHS_MACOS: ${{ matrix.arch }} CIBW_ENVIRONMENT_MACOS: | - CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local SYSTEM_VERSION_COMPAT=0 + CMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} CMAKE_PREFIX_PATH=/usr/local CIBW_BEFORE_ALL_MACOS: | python -m pip install cmake ninja setuptools From 2629e3a6f879c3aabc112dfe6ef69a780af4faf0 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Wed, 15 May 2024 11:41:17 -0400 Subject: [PATCH 10/12] ENH: Build changes suggested by @ncullen93 --- CMakeLists.txt | 6 ++---- pyproject.toml | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb126617..e62a06fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,8 +6,7 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Try to import all Python components potentially needed by nanobind find_package(Python 3.8 - REQUIRED COMPONENTS Interpreter Development.Module - OPTIONAL_COMPONENTS Development.SABIModule) + REQUIRED COMPONENTS Interpreter Development.Module) # Import nanobind through CMake's find_package mechanism find_package(nanobind CONFIG REQUIRED) @@ -40,10 +39,9 @@ add_library(imageMathUtilities STATIC src/antscore/ImageMathHelper2D.cxx src/an target_link_libraries(antsUtilities ${ITK_LIBRARIES}) target_link_libraries(registrationUtilities ${ITK_LIBRARIES}) target_link_libraries(imageMathUtilities ${ITK_LIBRARIES}) - + nanobind_add_module( lib - STABLE_ABI NB_STATIC src/main.cpp src/antscore/antsAffineInitializer.cxx diff --git a/pyproject.toml b/pyproject.toml index 87498864..f90008bf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -39,9 +39,6 @@ minimum-version = "0.4" # Setuptools-style build caching in a local directory build-dir = "build/{wheel_tag}" -# Build stable ABI wheels for CPython 3.12+ -wheel.py-api = "cp311" - cmake.args = [] wheel.packages = ["ants"] From 9bba59aecd041587d3950f2e41ab41dfb108ca67 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Wed, 15 May 2024 11:44:31 -0400 Subject: [PATCH 11/12] COMP: Remove python 3.8 wheel on Intel Mac Can't build successfully, despite multiple efforts --- .github/workflows/wheels.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 5d2e2a8f..96795695 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -63,11 +63,6 @@ jobs: platform_id: manylinux_x86_64 # macOS on Intel 64-bit - - os: macos-12 - python: '3.8' - cibw_python: 38 - arch: x86_64 - platform_id: macosx_x86_64 - os: macos-12 python: '3.9' cibw_python: 39 From e05d2e4f91580ccd64107a9a2c510c75f66276c1 Mon Sep 17 00:00:00 2001 From: Philip Cook Date: Wed, 15 May 2024 13:53:58 -0400 Subject: [PATCH 12/12] COMP: Remove windows 3.8 build --- .github/workflows/wheels.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 96795695..326e79e6 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -19,10 +19,6 @@ jobs: # Need to quote decimal versions as string to avoid the "Norway problem" # Windows 64-bit - - os: windows-latest - python: '3.8' - cibw_python: 38 - platform_id: win_amd64 - os: windows-latest python: '3.9' cibw_python: 39