From 24a90ad5144709b4f6a4f2c096b5d8f662170d71 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Jun 2023 12:17:37 -0400 Subject: [PATCH 1/7] fix: C compiler not needed Signed-off-by: Henry Schreiner --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69564bd..928b01d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 3.15...3.26) -project(${SKBUILD_PROJECT_NAME} VERSION ${SKBUILD_PROJECT_VERSION}) +project( + ${SKBUILD_PROJECT_NAME} + VERSION ${SKBUILD_PROJECT_VERSION} + LANGUAGES CXX) find_package(Python REQUIRED COMPONENTS Interpreter Development.Module) find_package(pybind11 CONFIG REQUIRED) From 107f7a79f1680f0943e3aa1b4064e30770bc8f8b Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Jun 2023 12:21:48 -0400 Subject: [PATCH 2/7] ci: extra debugging info Signed-off-by: Henry Schreiner --- .github/workflows/wheels.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 324535a..eb2b9fa 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -10,6 +10,9 @@ on: types: - published +env: + FORCE_COLOR: 3 + concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -52,6 +55,8 @@ jobs: CIBW_ARCHS_MACOS: universal2 CIBW_ARCHS_WINDOWS: auto ARM64 CIBW_PRERELEASE_PYTHONS: true + SKBUILD_BUILD_VERBOSE: 1 + CIBW_BUILD_VERBOSITY: 1 - name: Verify clean directory run: git diff --exit-code From b38997fdf9270b1aad782df09f8ad04a3a3adab2 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Jun 2023 13:32:08 -0400 Subject: [PATCH 3/7] Update .github/workflows/wheels.yml --- .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 eb2b9fa..7d8a2cc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,7 +55,7 @@ jobs: CIBW_ARCHS_MACOS: universal2 CIBW_ARCHS_WINDOWS: auto ARM64 CIBW_PRERELEASE_PYTHONS: true - SKBUILD_BUILD_VERBOSE: 1 + SKBUILD_CMAKE_VERBOSE: 1 CIBW_BUILD_VERBOSITY: 1 - name: Verify clean directory From f6d2517c27b03dabcf2a9996d7fd5391892facbe Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Jun 2023 14:14:40 -0400 Subject: [PATCH 4/7] Update CMakeLists.txt --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 928b01d..96342e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project( VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES CXX) -find_package(Python REQUIRED COMPONENTS Interpreter Development.Module) +find_package(Python REQUIRED COMPONENTS Interpreter Development.Module OPTIONAL_COMPONENTS Development.SABIModule) find_package(pybind11 CONFIG REQUIRED) python_add_library(_core MODULE src/main.cpp WITH_SOABI) From eac1fd3f16a3d29948f80df52376c5cb5c0635ae Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Jun 2023 22:26:58 -0400 Subject: [PATCH 5/7] Apply suggestions from code review --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 96342e3..928b01d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ project( VERSION ${SKBUILD_PROJECT_VERSION} LANGUAGES CXX) -find_package(Python REQUIRED COMPONENTS Interpreter Development.Module OPTIONAL_COMPONENTS Development.SABIModule) +find_package(Python REQUIRED COMPONENTS Interpreter Development.Module) find_package(pybind11 CONFIG REQUIRED) python_add_library(_core MODULE src/main.cpp WITH_SOABI) From 450bb244adba7898ed0a2abf63e0c3ee94b07926 Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Thu, 1 Jun 2023 23:54:32 -0400 Subject: [PATCH 6/7] Update pyproject.toml --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index d9564fe..dd0a217 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,6 +29,7 @@ test = ["pytest"] [tool.scikit-build] wheel.expand-macos-universal-tags = true +wheel.py-api = "cp313" [tool.pytest.ini_options] From 4c71ee974bd6726e0340b08f63f339ffb932b30f Mon Sep 17 00:00:00 2001 From: Henry Schreiner Date: Fri, 2 Jun 2023 00:44:36 -0400 Subject: [PATCH 7/7] Apply suggestions from code review --- .github/workflows/wheels.yml | 2 -- pyproject.toml | 1 - 2 files changed, 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7d8a2cc..2e5d45b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -55,8 +55,6 @@ jobs: CIBW_ARCHS_MACOS: universal2 CIBW_ARCHS_WINDOWS: auto ARM64 CIBW_PRERELEASE_PYTHONS: true - SKBUILD_CMAKE_VERBOSE: 1 - CIBW_BUILD_VERBOSITY: 1 - name: Verify clean directory run: git diff --exit-code diff --git a/pyproject.toml b/pyproject.toml index dd0a217..d9564fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,6 @@ test = ["pytest"] [tool.scikit-build] wheel.expand-macos-universal-tags = true -wheel.py-api = "cp313" [tool.pytest.ini_options]