simplifications, bump dependencies

Author: wjakob

CMakeLists.txt

@@ -1,6 +1,7 @@
-project(nanobind_example)
 cmake_minimum_required(VERSION 3.18...3.22)
 
+project(nanobind_example)
+
 if (NOT SKBUILD)
   message(WARNING "\
   This CMake file is meant to be executed using 'scikit-build'. Running
@@ -20,40 +21,26 @@ if (NOT SKBUILD)
   =====================================================================")
 endif()
 
-# The following boilerplate code configures CMake so that it finds the right
-# Python version (in particular, when it is run as part of 'scikit-build' using
-# the GitHub Actions continuous integration server)
-if (SKBUILD)
-  # Fix missing shared library name for cibuildwheel+windows+pypy3.9
-  if (MSVC AND NOT PYTHON_LIBRARY AND (${PYTHON_VERSION_STRING} MATCHES "3.9."))
-    get_filename_component(PYTHON_LIBRARY ${PYTHON_INCLUDE_DIR} DIRECTORY)
-    set(PYTHON_LIBRARY "${PYTHON_LIBRARY}/libs/python39.lib")
-  endif()
-
-  set(Python_VERSION "${PYTHON_VERSION_STRING}")
-  set(Python_EXECUTABLE "${PYTHON_EXECUTABLE}")
-  set(Python_INCLUDE_DIR "${PYTHON_INCLUDE_DIR}")
-  set(Python_LIBRARY "${PYTHON_LIBRARY}")
-elseif (MSVC)
-  # MSVC needs a little extra help finding the Python library
-  find_package(PythonInterp)
-  find_package(Python)
+# Perform a release build by default
+if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
 # Create CMake targets for all Python components needed by nanobind
-if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.26)
+if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.26 AND Python_INTERPRETER_ID STREQUAL "Python")
   find_package(Python 3.8 COMPONENTS Interpreter Development.Module Development.SABIModule REQUIRED)
 else()
   find_package(Python 3.8 COMPONENTS Interpreter Development.Module REQUIRED)
 endif()
 
-# Run `nanobind.cmake_dir()` from Python to detect where nanobind is installed
+# Determine the nanobind CMake include path and register it
 execute_process(
-  COMMAND "${Python_EXECUTABLE}" -c "import nanobind; print(nanobind.cmake_dir())"
+  COMMAND "${Python_EXECUTABLE}" -m nanobind --cmake_dir
   OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE NB_DIR)
 list(APPEND CMAKE_PREFIX_PATH "${NB_DIR}")
 
-# Now, import nanobind through CMake's find_package mechanism
+# Import nanobind through CMake's find_package mechanism
 find_package(nanobind CONFIG REQUIRED)
 
 # We are now ready to compile the actual extension module

pyproject.toml

@@ -2,9 +2,9 @@
 requires = [
     "setuptools>=42",
     "wheel",
-    "scikit-build==0.14.0",
+    "scikit-build>=0.16.7",
     "cmake>=3.18",
-    "nanobind>=0.2.0",
+    "nanobind>=1.1.0",
     "ninja; platform_system!='Windows'"
 ]
 

setup.py

@@ -1,4 +1,4 @@
-import sys, re, os
+import sys
 
 try:
     from skbuild import setup