From 4f4535989d033aa31b2d3e24a11e70a6b52ac6a5 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 19 Jun 2024 16:32:02 -0400 Subject: [PATCH 1/3] BUG: Fix Python test expression Add missing period before the type. --- wrapping/test/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wrapping/test/CMakeLists.txt b/wrapping/test/CMakeLists.txt index 51167e0..475cf49 100644 --- a/wrapping/test/CMakeLists.txt +++ b/wrapping/test/CMakeLists.txt @@ -1,11 +1,11 @@ # test regular image to RLE conversion itk_python_expression_add_test(NAME itkRegionOfInterestImageFilterISS2RLEImageSS2USPythonTest - EXPRESSION "instance = itk.RegionOfInterestImageFilterISS2RLEImageSS2US.New()") + EXPRESSION "instance = itk.RegionOfInterestImageFilter.ISS2RLEImageSS2US.New()") # test RLE to regular image conversion itk_python_expression_add_test(NAME itkRegionOfInterestImageFilterRLEImageSS2USISS2PythonTest - EXPRESSION "instance = itk.RegionOfInterestImageFilterRLEImageSS2USISS2.New()") + EXPRESSION "instance = itk.RegionOfInterestImageFilter.RLEImageSS2USISS2.New()") # test RLE to RLE (plain RoI operation) itk_python_expression_add_test(NAME itkRegionOfInterestImageFilterRLEImageSS2USRLEImageSS2USPythonTest - EXPRESSION "instance = itk.RegionOfInterestImageFilterRLEImageSS2USRLEImageSS2US.New()") + EXPRESSION "instance = itk.RegionOfInterestImageFilter.RLEImageSS2USRLEImageSS2US.New()") From feb581024fd22d13dba0e7ce72f7bde98c3e3c7b Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 19 Jun 2024 16:33:06 -0400 Subject: [PATCH 2/3] COMP: Update CI configuration for ITK 5.4 Also add Python config. --- .github/workflows/build-test-package.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-test-package.yml b/.github/workflows/build-test-package.yml index 8ca3a79..4b5f746 100644 --- a/.github/workflows/build-test-package.yml +++ b/.github/workflows/build-test-package.yml @@ -4,5 +4,9 @@ on: [push,pull_request] jobs: cxx-build-workflow: - uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@3f63de316255a285b0cac4c819d3d45649738999 + 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@v5.4.0 + secrets: + pypi_password: ${{ secrets.pypi_password }} From 8933edb17c113e020754effec25d46e302bbcdd9 Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 19 Jun 2024 16:34:56 -0400 Subject: [PATCH 3/3] ENH: Update package configuration for scikit-build-core setup.py to pyproject.toml. --- pyproject.toml | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 53 ------------------------ 2 files changed, 110 insertions(+), 53 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..a4ba29b --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,110 @@ +[build-system] +requires = ["scikit-build-core"] +build-backend = "scikit_build_core.build" + +[project] +name = "itk-rleimage" +version = "1.0.1" +description = "ITKRLEImage provides run-length encoded storage for ITK images" +readme = "README.rst" +license = {file = "LICENSE"} +authors = [ + { name = "Paul A. Yushkevich", email = "pauly2@mail.med.upenn.edu" }, + { name = "Dženan Zukić", email = "dzenan.zukic@kitware.com" }, + { name = "Matt 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 == 5.4.*", +] + +[project.urls] +Download = "https://github.com/KitwareMedical/ITKRLEImage" +Homepage = "https://github.com/KitwareMedical/ITKRLEImage" + +[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-core 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 d2972ad..0000000 --- a/setup.py +++ /dev/null @@ -1,53 +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-rleimage', - version='1.0.1', - author='Paul A. Yushkevich', - author_email='pauly2@mail.med.upenn.edu', - packages=['itk'], - package_dir={'itk': 'itk'}, - download_url=r'https://github.com/KitwareMedical/ITKRLEImage', - description=r'ITK classes for run-length encoded memory compression', - long_description='ITKRLEImage provides run-length encoded storage for' - 'image content, iterators for efficient reading and' - 'writing, and a specialization of region of interest' - 'filter which can also be used to convert to and from' - 'regular `itk::Image`.', - 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 Run-length-encoding', - url=r'https://github.com/KitwareMedical/ITKRLEImage', - install_requires=[ - r'itk>=5.4rc2' - ] - )