nmhit 0.1.1__tar.gz → 0.1.3__tar.gz

{nmhit-0.1.1 → nmhit-0.1.3}/.github/workflows/ci.yml

@@ -48,7 +48,7 @@ jobs:
       - name: Build wheel (native arch)
         uses: pypa/cibuildwheel@v2.19
         env:
-          CIBW_BUILD: "cp39-*"
+          CIBW_BUILD: "cp39-* cp313-*"
           CIBW_SKIP:  "*-musllinux* *-manylinux_i686"
           CIBW_ARCHS_LINUX: "x86_64"
           CIBW_ARCHS_MACOS: "native"

{nmhit-0.1.1 → nmhit-0.1.3}/.github/workflows/release.yml

@@ -27,8 +27,7 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.19
         env:
-          # STABLE_ABI: cp39-* produces one abi3 wheel covering Python 3.9+
-          CIBW_BUILD: "cp39-*"
+          CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-*"
           CIBW_SKIP:  "*-musllinux* *-manylinux_i686"
           CIBW_ARCHS_LINUX: "x86_64 aarch64"
           CIBW_ARCHS_MACOS: "x86_64 arm64"

{nmhit-0.1.1 → nmhit-0.1.3}/CMakeLists.txt

@@ -1,5 +1,6 @@
-cmake_minimum_required(VERSION 3.26)
-project(neml2-hit VERSION 0.1.0 LANGUAGES CXX)
+cmake_minimum_required(VERSION 3.20)
+# Keep this version in sync with [project] version in pyproject.toml.
+project(neml2-hit VERSION 0.1.3 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -19,6 +20,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT CMAKE_BUILD_TYPE)
     src/Lexer.l
     ${CMAKE_CURRENT_BINARY_DIR}/Lexer.cpp
     DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Lexer.h
+    COMPILE_FLAGS "--noline"
   )
 
   BISON_TARGET(
@@ -26,6 +28,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT CMAKE_BUILD_TYPE)
     src/Parser.y
     ${CMAKE_CURRENT_BINARY_DIR}/Parser.cpp
     DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/Parser.h
+    COMPILE_FLAGS "--no-lines"
   )
 
   ADD_FLEX_BISON_DEPENDENCY(HITLexer HITParser)
@@ -37,18 +40,23 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR NOT CMAKE_BUILD_TYPE)
   set(_parser_include_dir ${CMAKE_CURRENT_BINARY_DIR})
 
   # Helper target: copy freshly-generated files back to generated/ for committing.
+  # The sed step removes any residual #line directives (flex emits one before
+  # %top{} even with --noline) so no local filesystem paths leak into the repo.
+  set(_gen_dest ${CMAKE_CURRENT_SOURCE_DIR}/generated)
   add_custom_target(update_generated
     COMMAND ${CMAKE_COMMAND} -E copy
-      ${CMAKE_CURRENT_BINARY_DIR}/Lexer.cpp
-      ${CMAKE_CURRENT_BINARY_DIR}/Lexer.h
-      ${CMAKE_CURRENT_BINARY_DIR}/Parser.cpp
-      ${CMAKE_CURRENT_BINARY_DIR}/Parser.h
-      ${CMAKE_CURRENT_BINARY_DIR}/location.hh
-      ${CMAKE_CURRENT_SOURCE_DIR}/generated/
+      Lexer.cpp Lexer.h Parser.cpp Parser.h location.hh ${_gen_dest}/
+    COMMAND sed -i "/^#line /d"
+      ${_gen_dest}/Lexer.cpp
+      ${_gen_dest}/Lexer.h
+      ${_gen_dest}/Parser.cpp
+      ${_gen_dest}/Parser.h
+      ${_gen_dest}/location.hh
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     DEPENDS
       ${FLEX_HITLexer_OUTPUTS}
       ${BISON_HITParser_OUTPUTS}
-    COMMENT "Copying generated parser/lexer files to generated/"
+    COMMENT "Stripping #line directives and copying generated parser/lexer files to generated/"
   )
 else()
   set(_parser_sources
@@ -148,7 +156,13 @@ endif()
 
 option(NMHIT_BUILD_PYTHON "Build Python bindings via nanobind" OFF)
 if(NMHIT_BUILD_PYTHON)
-  find_package(Python 3.9 REQUIRED COMPONENTS Interpreter Development.Module Development.SABIModule)
+  # Per-version wheels: only Development.Module is needed here.
+  # When Python 3.12 becomes the project minimum, switch to a single abi3 wheel:
+  #   - set wheel.py-api = "cp312" in pyproject.toml
+  #   - add Development.SABIModule to this find_package call (requires CMake >= 3.26)
+  #   - add STABLE_ABI back to nanobind_add_module below
+  # nanobind's STABLE_ABI silently no-ops below Python 3.12 (Py_LIMITED_API=0x030C0000).
+  find_package(Python 3.9 REQUIRED COMPONENTS Interpreter Development.Module)
 
   # Locate nanobind's CMake integration through the Python interpreter.
   # scikit-build-core installs nanobind into the build venv so it is findable
@@ -168,7 +182,6 @@ if(NMHIT_BUILD_PYTHON)
 
   nanobind_add_module(
     _nmhit
-    STABLE_ABI  # Py_LIMITED_API=0x03090000: one .so covers Python 3.9+
     NB_STATIC   # embed nanobind runtime; wheel is self-contained
     python/src/_nmhit.cpp
   )

{nmhit-0.1.1 → nmhit-0.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nmhit
-Version: 0.1.1
+Version: 0.1.3
 Summary: Python bindings for the nmhit NEML2-flavored HIT parser
 License: MIT
 Classifier: Programming Language :: Python :: 3