From 491dd66db56be7087d1cd06e079ecc34351d6c30 Mon Sep 17 00:00:00 2001 From: Matt McCormick <matt.mccormick@kitware.com> Date: Wed, 5 Jun 2024 14:07:24 -0400 Subject: [PATCH 1/4] ENH: Update CI for ITK 5.4.0 --- .github/workflows/build-test-package.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index b3605bc..4b5f746 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -4,9 +4,9 @@ on: [push,pull_request] jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@5083da2740617b78423ebf6083489e1e70ee8ca0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@v5.4.0 python-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@5083da2740617b78423ebf6083489e1e70ee8ca0 + uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@v5.4.0 secrets: pypi_password: ${{ secrets.pypi_password }} From b628da3a02b9e6dccc36995e1b46ea7b23e2ea80 Mon Sep 17 00:00:00 2001 From: Matt McCormick <matt.mccormick@kitware.com> Date: Wed, 5 Jun 2024 14:14:48 -0400 Subject: [PATCH 2/4] ENH: Migrate Python packaging config to pyproject.toml Uses scikit-build-core. --- pyproject.toml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 49 ---------------------- 2 files changed, 110 insertions(+), 49 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..daf6d7c --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,110 @@ +[build-system] +requires = ["scikit-build-core"] +build-backend = "scikit_build_core.build" + +[project] +name = "itk-cuberille" +version = "2.6.0" +description = "Cuberille implicit surface polygonization to generate meshes from images." +readme = "README.rst" +license = {file = "LICENSE"} +authors = [ + { name = "Dan Meuller" }, + { name = "Matthew M. McCormick", email = "matt.mccormick@kitware.com" }, +] +keywords = [ + "itk", +] +classifiers = [ + "Development Status :: 4 - Beta", + "Intended Audience :: Developers", + "Intended Audience :: Education", + "Intended Audience :: Healthcare Industry", + "Intended Audience :: Science/Research", + "License :: OSI Approved :: Apache Software License", + "Operating System :: Android", + "Operating System :: MacOS", + "Operating System :: Microsoft :: Windows", + "Operating System :: POSIX", + "Operating System :: Unix", + "Programming Language :: C++", + "Programming Language :: Python", + "Topic :: Scientific/Engineering", + "Topic :: Scientific/Engineering :: Information Analysis", + "Topic :: Scientific/Engineering :: Medical Science Apps.", + "Topic :: Software Development :: Libraries", +] +requires-python = ">=3.8" +dependencies = [ + "itk-io == 5.4.*", + "numpy", +] + +[project.urls] +Download = "https://github.com/InsightSoftwareConsortium/ITKCuberille" +Homepage = "https://github.com/InsightSoftwareConsortium/ITKCuberille" + +[tool.scikit-build] +# The versions of CMake to allow. If CMake is not present on the system or does +# not pass this specifier, it will be downloaded via PyPI if possible. An empty +# string will disable this check. +cmake.version = ">=3.16.3" + +# A list of args to pass to CMake when configuring the project. Setting this in +# config or envvar will override toml. See also ``cmake.define``. +cmake.args = [] + +# A table of defines to pass to CMake when configuring the project. Additive. +cmake.define = {} + +# Verbose printout when building. +cmake.verbose = true + +# The build type to use when building the project. Valid options are: "Debug", +# "Release", "RelWithDebInfo", "MinSizeRel", "", etc. +cmake.build-type = "Release" + +# The source directory to use when building the project. Currently only affects +# the native builder (not the setuptools plugin). +cmake.source-dir = "." + +# The versions of Ninja to allow. If Ninja is not present on the system or does +# not pass this specifier, it will be downloaded via PyPI if possible. An empty +# string will disable this check. +ninja.version = ">=1.11" + +# The logging level to display, "DEBUG", "INFO", "WARNING", and "ERROR" are +# possible options. +logging.level = "INFO" + +# Files to include in the SDist even if they are skipped by default. Supports +# gitignore syntax. +sdist.include = [] + +# Files to exclude from the SDist even if they are included by default. Supports +# gitignore syntax. +sdist.exclude = [] + +# A list of license files to include in the wheel. Supports glob patterns. +wheel.license-files = ["LICEN[CS]E*",] + +# Target the platlib or the purelib. If not set, the default is to target the +# platlib if wheel.cmake is true, and the purelib otherwise. +wheel.platlib = "false" + +# If CMake is less than this value, backport a copy of FindPython. Set to 0 +# disable this, or the empty string. +backport.find-python = "3.26.1" + +# Select the editable mode to use. Can be "redirect" (default) or "inplace". +editable.mode = "redirect" + +# Rebuild the project when the package is imported. The build-directory must be +# set. +editable.rebuild = false + +# If set, this will provide a method for scikit-build backward compatibility. +minimum-version = "0.8.2" + +# The build directory. Defaults to a temporary directory, but can be set. +build-dir = "build/{wheel_tag}" diff --git a/setup.py b/setup.py deleted file mode 100644 index 1967bc0..0000000 --- a/setup.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -from __future__ import print_function -from os import sys - -try: - from skbuild import setup -except ImportError: - print('scikit-build is required to build from source.', file=sys.stderr) - print('Please run:', file=sys.stderr) - print('', file=sys.stderr) - print(' python -m pip install scikit-build') - sys.exit(1) - -setup( - name='itk-cuberille', - version='2.6.0', - author='Dan Mueller', - author_email='itk+community@discourse.itk.org', - packages=['itk'], - package_dir={'itk': 'itk'}, - download_url=r'https://github.com/InsightSoftwareConsortium/ITKCuberille', - description=r'This module implements cuberille implicit surface polygonization for ITK.', - long_description=r'This method operates by dividing the surface into a number of small cubes called cuberilles. Each cuberille is centered at a pixel lying on the iso-surface and then quadrilaterals are generated for each face. The original approach is improved by projecting the vertices of each cuberille onto the implicit surface, smoothing the typical block-like resultant mesh.', - classifiers=[ - "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python", - "Programming Language :: C++", - "Development Status :: 4 - Beta", - "Intended Audience :: Developers", - "Intended Audience :: Education", - "Intended Audience :: Healthcare Industry", - "Intended Audience :: Science/Research", - "Topic :: Scientific/Engineering", - "Topic :: Scientific/Engineering :: Medical Science Apps.", - "Topic :: Scientific/Engineering :: Information Analysis", - "Topic :: Software Development :: Libraries", - "Operating System :: Android", - "Operating System :: Microsoft :: Windows", - "Operating System :: POSIX", - "Operating System :: Unix", - "Operating System :: MacOS" - ], - license='Apache', - keywords='ITK InsightToolkit', - url=r'https://itk.org/', - install_requires=[ - r'itk>=5.3.0' - ] - ) From 61c5261aa45fc2da92b1280f0ba4e3580f807384 Mon Sep 17 00:00:00 2001 From: Matt McCormick <matt.mccormick@kitware.com> Date: Wed, 5 Jun 2024 14:19:42 -0400 Subject: [PATCH 3/4] ENH: Use setuptools_scm to set Python package version Based on Git tag and commits. Needs to be installed in requirements-dev.txt along with other build packages until: https://github.com/InsightSoftwareConsortium/ITKPythonPackage/pull/276 https://github.com/InsightSoftwareConsortium/ITKPythonPackage/pull/277 are released. --- pyproject.toml | 10 ++++++++-- requirements-dev.txt | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 requirements-dev.txt diff --git a/pyproject.toml b/pyproject.toml index daf6d7c..7d54a78 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,9 @@ [build-system] -requires = ["scikit-build-core"] +requires = ["scikit-build-core", "setuptools_scm>=8"] build-backend = "scikit_build_core.build" [project] name = "itk-cuberille" -version = "2.6.0" description = "Cuberille implicit surface polygonization to generate meshes from images." readme = "README.rst" license = {file = "LICENSE"} @@ -39,11 +38,18 @@ dependencies = [ "itk-io == 5.4.*", "numpy", ] +dynamic = ["version"] [project.urls] Download = "https://github.com/InsightSoftwareConsortium/ITKCuberille" Homepage = "https://github.com/InsightSoftwareConsortium/ITKCuberille" +[tool.setuptools_scm] +# Intentionally blank to use the default behavior without warnings. + +[tool.scikit-build.metadata] +version.provider = "scikit_build_core.metadata.setuptools_scm" + [tool.scikit-build] # The versions of CMake to allow. If CMake is not present on the system or does # not pass this specifier, it will be downloaded via PyPI if possible. An empty diff --git a/requirements-dev.txt b/requirements-dev.txt new file mode 100644 index 0000000..368620f --- /dev/null +++ b/requirements-dev.txt @@ -0,0 +1,6 @@ +ninja==1.11.1.1 +scikit-build-core==0.9.5 +build==1.2.1 +pyproject-metadata +pathspec +setuptools_scm==8.1.0 From 075b198d6f52cb515a679da747b58e4d97a2f70b Mon Sep 17 00:00:00 2001 From: Matt McCormick <matt.mccormick@kitware.com> Date: Wed, 5 Jun 2024 15:46:27 -0400 Subject: [PATCH 4/4] COMP: Update cmake_minimum_required to 3.16.3 CI Windows test failures. CMake Warning at D:/a/ITKCuberille/ITK/CMake/ITKModuleExternal.cmake:15 (message): -- This is needed to allow proper setting of CMAKE_MSVC_RUNTIME_LIBRARY. -- Do not be surprised if you run into link errors of the style: LNK2038: mismatch detected for 'RuntimeLibrary': value 'MTd_Static' doesn't match value 'MDd_Dynamic' in module.obj cmake_minimum_required must be at least 3.16.3 Call Stack (most recent call first): CMakeLists.txt:7 (include) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ae07bec..e17b384 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10.2) +cmake_minimum_required(VERSION 3.16.3) project(Cuberille) if(NOT ITK_SOURCE_DIR)