Update build tools (#462)

Author: gentlegiantJGC

.github/workflows/python-build.yml

@@ -10,9 +10,11 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
-          - { os: windows-2025, python-version: '3.14', architecture: x64 }
-          - { os: windows-11-arm, python-version: '3.14', architecture: arm64 }
-          - { os: macos-15, python-version: '3.14', architecture: arm64 }
+          - { os: windows-2025-vs2026, python-version: '3.14', architecture: x64, whl: 'cp314-win_amd64' }
+          - { os: windows-11-vs2026-arm, python-version: '3.14', architecture: arm64, whl: 'cp314-win_arm64' }
+          - { os: macos-15-intel, python-version: '3.14', architecture: x64, whl: 'cp314-macosx_x86_64' }
+          - { os: macos-15, python-version: '3.14', architecture: arm64, whl: 'cp314-macosx_arm64' }
+          - { os: ubuntu-24.04, python-version: '3.14', architecture: x64, whl: 'cp314-manylinux_x86_64' }
 
     runs-on: ${{ matrix.cfg.os }}
     defaults:
@@ -21,24 +23,30 @@ jobs:
 
     steps:
     - name: Clone
-      uses: actions/checkout@v6
-
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v2
+      uses: actions/checkout@v7
 
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.cfg.python-version }}
+        architecture: ${{ matrix.cfg.architecture }}
 
-    - name: Install dependencies
-      shell: bash
+    - name: Build sdist
       run: |
-        pip install build twine
+        pip install build
+        python -m build --sdist --outdir dist .
 
     - name: Build
+      env:
+        CIBW_TEST_COMMAND: ""
+      run: |
+        pip install cibuildwheel~=4.1
+        cibuildwheel --only ${{ matrix.cfg.whl }} --output-dir dist .
+
+    - name: Install twine
+      shell: bash
       run: |
-        python -m build .
+        pip install twine
 
     - name: Publish
       env:

.github/workflows/python-stylecheck.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
     - name: Clone
-      uses: actions/checkout@v6
+      uses: actions/checkout@v7
 
     - name: Set up Python
       uses: actions/setup-python@v6

.github/workflows/python-unittests.yml

@@ -15,11 +15,11 @@ jobs:
       fail-fast: false
       matrix:
         cfg:
-          - { os: windows-2025, python-version: '3.14', architecture: x64 }
-          - { os: windows-11-arm, python-version: '3.14', architecture: arm64 }
-          - { os: macos-15-intel, python-version: '3.14', architecture: x64 }
-          - { os: macos-15, python-version: '3.14', architecture: arm64 }
-          - { os: ubuntu-24.04, python-version: '3.14', architecture: x64 }
+          - { os: windows-2025-vs2026, python-version: '3.14', architecture: x64, whl: 'cp314-win_amd64' }
+          - { os: windows-11-vs2026-arm, python-version: '3.14', architecture: arm64, whl: 'cp314-win_arm64' }
+          - { os: macos-15-intel, python-version: '3.14', architecture: x64, whl: 'cp314-macosx_x86_64' }
+          - { os: macos-15, python-version: '3.14', architecture: arm64, whl: 'cp314-macosx_arm64' }
+          - { os: ubuntu-24.04, python-version: '3.14', architecture: x64, whl: 'cp314-manylinux_x86_64' }
 
     runs-on: ${{ matrix.cfg.os }}
     timeout-minutes: 45
@@ -29,21 +29,20 @@ jobs:
 
     steps:
     - name: Clone
-      uses: actions/checkout@v6
-
-    - name: Setup cmake
-      uses: jwlawson/actions-setup-cmake@v2
+      uses: actions/checkout@v7
 
     - name: Set up Python
       uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.cfg.python-version }}
         architecture: ${{ matrix.cfg.architecture }}
-        
-    - name: Build
+
+    - name: Build and Test
       run: |
-        pip install -v .[dev]
-        python tools/compile_tests.py
-        
-    - name: Test with unittest
-      run: python -m unittest discover -v -s tests
+        pip install cibuildwheel~=4.1
+        cibuildwheel --only ${{ matrix.cfg.whl }} --output-dir dist .
+
+    - name: Upload artifacts
+      uses: actions/upload-artifact@v7
+      with:
+        path: dist/*

CMakeLists.txt

@@ -26,7 +26,7 @@ if (MSVC)
     add_definitions("/MP")
 endif()
 
-find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
+find_package(Python3 COMPONENTS Interpreter Development.Module REQUIRED)
 
 # Find libraries
 if (NOT TARGET pybind11::module)
@@ -47,10 +47,10 @@ endif()
 
 # Find C++ files
 file(REAL_PATH src SOURCE_PATH)
-file(GLOB_RECURSE EXTENSION_SOURCES LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/*.py.cpp)
-file(GLOB_RECURSE EXTENSION_HEADERS LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/*.py.hpp)
-file(GLOB_RECURSE SOURCES LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/*.cpp)
-file(GLOB_RECURSE HEADERS LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/*.hpp)
+file(GLOB_RECURSE EXTENSION_SOURCES LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/core/*.py.cpp)
+file(GLOB_RECURSE EXTENSION_HEADERS LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/core/*.py.hpp)
+file(GLOB_RECURSE SOURCES LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/core/*.cpp)
+file(GLOB_RECURSE HEADERS LIST_DIRECTORIES false ${SOURCE_PATH}/amulet/core/*.hpp)
 list(REMOVE_ITEM SOURCES ${EXTENSION_SOURCES})
 list(REMOVE_ITEM HEADERS ${EXTENSION_HEADERS})
 
@@ -75,6 +75,11 @@ endforeach()
 
 # Add python extension
 pybind11_add_module(_amulet_core)
+if(APPLE)
+    set_target_properties(_amulet_core PROPERTIES INSTALL_RPATH "@loader_path")
+elseif(UNIX)
+    set_target_properties(_amulet_core PROPERTIES INSTALL_RPATH "$ORIGIN")
+endif()
 set_target_properties(_amulet_core PROPERTIES CXX_VISIBILITY_PRESET hidden)
 set_target_properties(_amulet_core PROPERTIES FOLDER "Python")
 target_link_libraries(_amulet_core PRIVATE amulet_pybind11_extensions)

get_compiler/__init__.py

@@ -3,7 +3,10 @@
 from tempfile import TemporaryDirectory
 
 
-def main() -> str:
+def main(sdist: bool = False) -> str:
+    if sdist:
+        return "~=4.0"
+
     if subprocess.run(["cmake", "--version"]).returncode:
         raise RuntimeError("Could not find cmake")
 

mypy.ini

@@ -5,7 +5,7 @@ warn_return_any = True
 python_version = 3.14
 explicit_package_bases = True
 mypy_path = $MYPY_CONFIG_FILE_DIR/src,$MYPY_CONFIG_FILE_DIR/tests
-files = 
+files =
     src,
     tests,
     tools,

pyproject.toml

@@ -73,3 +73,30 @@ versionfile_source = "src/amulet/core/_version.py"
 versionfile_build = "amulet/core/_version.py"
 tag_prefix = ""
 parentdir_prefix = "amulet_core-"
+
+[tool.cibuildwheel]
+test-sources = ["tests", "tools/compile_tests.py"]
+test-command = [
+    "python -m venv venv_build",
+    "venv_build/bin/pip install {wheel}[dev]",
+    "venv_build/bin/python tools/compile_tests.py",
+    "python -m unittest discover -s tests"
+]
+
+manylinux-x86_64-image = "manylinux_2_34"
+
+[tool.cibuildwheel.linux]
+before-all = "yum install -y cmake"
+repair-wheel-command = "auditwheel repair --exclude libamulet_utils.so --exclude libamulet_nbt.so -w {dest_dir} {wheel}"
+
+[tool.cibuildwheel.macos]
+repair-wheel-command = "delocate-wheel --require-archs {delocate_archs} --ignore-missing-dependencies --exclude libamulet_utils.dylib --exclude libamulet_nbt.dylib -w {dest_dir} -v {wheel}"
+
+[tool.cibuildwheel.windows]
+repair-wheel-command = "delvewheel repair --ignore-existing --exclude \"msvcp140.dll;amulet_utils.dll;amulet_nbt.dll\" -w {dest_dir} -v {wheel}"
+test-command = [
+    "python -m venv venv_build",
+    "venv_build\\Scripts\\pip install {wheel}[dev]",
+    "venv_build\\Scripts\\python tools/compile_tests.py",
+    "python -m unittest discover -s tests"
+]

requirements.py

@@ -4,12 +4,12 @@
 
 AMULET_COMPILER_TARGET_REQUIREMENT = "==2.0"
 
-PYBIND11_REQUIREMENT = "==3.0.1"
+PYBIND11_REQUIREMENT = "==3.0.4"
 AMULET_PYBIND11_EXTENSIONS_REQUIREMENT = "~=1.2.0.0a2"
 AMULET_IO_REQUIREMENT = "~=2.0.0.0a0"
-AMULET_UTILS_REQUIREMENT = "~=1.1.4.0a"
-AMULET_ZLIB_REQUIREMENT = "~=1.0.9.0a0"
-AMULET_NBT_REQUIREMENT = "~=5.0.4.0a0"
+AMULET_UTILS_REQUIREMENT = "~=1.1.5.0a"
+AMULET_ZLIB_REQUIREMENT = "~=1.0.11.0a0"
+AMULET_NBT_REQUIREMENT = "~=5.0.5.0a0"
 NUMPY_REQUIREMENT = "~=2.0"
 
 if os.environ.get("AMULET_PYBIND11_EXTENSIONS_REQUIREMENT", None):
@@ -47,9 +47,6 @@ def get_specifier_set(version_str: str) -> str:
     return f"~={version.major}.{version.minor}.{version.micro}.0{''.join(map(str, version.pre or ()))}"
 
 
-AMULET_COMPILER_VERSION_REQUIREMENT = get_compiler.main()
-
-
 try:
     import amulet.pybind11_extensions
 except ImportError:
@@ -90,7 +87,7 @@ def get_specifier_set(version_str: str) -> str:
 
 def get_build_dependencies() -> list:
     return [
-        f"amulet-compiler-version{AMULET_COMPILER_VERSION_REQUIREMENT}",
+        f"amulet-compiler-version{get_compiler.main()}",
         f"pybind11{PYBIND11_REQUIREMENT}",
         f"amulet-pybind11-extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
         f"amulet-io{AMULET_IO_REQUIREMENT}",
@@ -100,10 +97,10 @@ def get_build_dependencies() -> list:
     ] * (not os.environ.get("AMULET_SKIP_COMPILE", None))
 
 
-def get_runtime_dependencies() -> list[str]:
+def get_runtime_dependencies(sdist: bool = False) -> list[str]:
     return [
         f"amulet-compiler-target{AMULET_COMPILER_TARGET_REQUIREMENT}",
-        f"amulet-compiler-version{AMULET_COMPILER_VERSION_REQUIREMENT}",
+        f"amulet-compiler-version{get_compiler.main(sdist)}",
         f"pybind11{PYBIND11_REQUIREMENT}",
         f"amulet-pybind11-extensions{AMULET_PYBIND11_EXTENSIONS_REQUIREMENT}",
         f"amulet-io{AMULET_IO_REQUIREMENT}",

setup.py

@@ -46,7 +46,7 @@ def build_extension(self, ext: Extension) -> None:
 
         platform_args = []
         if sys.platform == "win32":
-            platform_args.extend(["-G", "Visual Studio 17 2022"])
+            platform_args.extend(["-G", "Visual Studio 18 2026"])
             if sysconfig.get_platform() == "win-amd64":
                 platform_args.extend(["-A", "x64"])
             elif sysconfig.get_platform() == "win32":
@@ -55,7 +55,7 @@ def build_extension(self, ext: Extension) -> None:
                 platform_args.extend(["-A", "ARM64"])
             else:
                 raise RuntimeError(f"Unsupported platform: {sysconfig.get_platform()}")
-            platform_args.extend(["-T", "v143"])
+            platform_args.extend(["-T", "v145"])
         elif sys.platform == "darwin":
             if platform.machine() == "arm64":
                 platform_args.append("-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64")
@@ -99,5 +99,7 @@ def build_extension(self, ext: Extension) -> None:
     cmdclass=cmdclass,
     ext_modules=[Extension("amulet.core._amulet_core", [])]
     * (not os.environ.get("AMULET_SKIP_COMPILE", None)),
-    install_requires=requirements.get_runtime_dependencies(),
+    install_requires=requirements.get_runtime_dependencies(
+        sys.argv[1] in ["egg_info", "sdist"]
+    ),
 )

src/amulet/core/__init__.py

@@ -11,28 +11,15 @@
 def _init() -> None:
     import os
     import sys
-    import ctypes
 
     if os.environ.get("AMULET_SKIP_COMPILE", None):
         return
 
-    if sys.platform == "win32":
-        lib_path = os.path.join(os.path.dirname(__file__), "amulet_core.dll")
-    elif sys.platform == "darwin":
-        lib_path = os.path.join(os.path.dirname(__file__), "libamulet_core.dylib")
-    elif sys.platform == "linux":
-        lib_path = os.path.join(os.path.dirname(__file__), "libamulet_core.so")
-    else:
-        raise RuntimeError(f"Unsupported platform {sys.platform}")
-
     # Import dependencies
     import amulet.utils
     import amulet.zlib
     import amulet.nbt
 
-    # Load the shared library
-    ctypes.cdll.LoadLibrary(lib_path)
-
     from ._amulet_core import init
 
     init(sys.modules[__name__])