Skip to content

Commit

Permalink
Merge pull request #278 from InsightSoftwareConsortium/itk-5.4rc03
Browse files Browse the repository at this point in the history
Itk 5.4rc03+patches+pyproject.toml-stable-abi-wheels--macos-arm
  • Loading branch information
thewtex authored Apr 22, 2024
2 parents f1b09e5 + 429fd5f commit 99a1d74
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 73 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ on: [push,pull_request]

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@3f63de316255a285b0cac4c819d3d45649738999
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@e15be287b1e1940b51e38fd6c8e0a32cfe629154

python-build-workflow-dev:
if: github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags')
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@3f63de316255a285b0cac4c819d3d45649738999
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@e15be287b1e1940b51e38fd6c8e0a32cfe629154
with:
python3-minor-versions: '["8","11"]'
manylinux-platforms: '["_2_28-x64","2014-x64"]'
test-notebooks: true
secrets:
pypi_password: ${{ secrets.pypi_password }}

python-build-workflow-main:
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags')
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@3f63de316255a285b0cac4c819d3d45649738999
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@e15be287b1e1940b51e38fd6c8e0a32cfe629154
with:
python3-minor-versions: '["8","9","10","11"]'
manylinux-platforms: '["_2_28-x64","2014-x64"]'
Expand Down
114 changes: 114 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
[build-system]
requires = ["scikit-build-core"]
build-backend = "scikit_build_core.build"

[project]
name = "itk-elastix"
version = "0.19.2"
description = "Provides an ITK Python interface to elastix, a toolbox for rigid and nonrigid registration of images"
readme = "README.md"
license = {file = "LICENSE"}
authors = [
{ name = "Matthew M. McCormick", email = "[email protected]" },
{ name = "ViktorvdValk", email = "[email protected]" },
{ name = "Niels Dekker", email = "[email protected]" },
{ name = "Tom Birdsong" },
{ name = "Konstantinos Ntatsis", email = "[email protected]" },
]
keywords = [
"itk",
"elastix",
"registration",
]
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.4rc3",
]

[project.urls]
Download = "https://github.com/InsightSoftwareConsortium/ITKElastix"
Homepage = "https://github.com/InsightSoftwareConsortium/ITKElastix"

[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 backward compatibility.
minimum-version = "0.8.2"

# The build directory. Defaults to a temporary directory, but can be set.
build-dir = "build/{wheel_tag}"
54 changes: 0 additions & 54 deletions setup.py

This file was deleted.

2 changes: 2 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ CreateTestDriver(Elastix "${Elastix-Test_LIBRARIES}" "${ElastixTests}")
itk_add_test(NAME itkElastixRegistrationMethodTest
COMMAND ElastixTestDriver
--compareNumberOfPixelsTolerance 25
--compareRadiusTolerance 3
--compareIntensityTolerance 50
--compare
${ITK_TEST_OUTPUT_DIR}/itkElastixRegistrationMethodTestOutput.mha
DATA{Baseline/itkElastixRegistrationMethodTestOutput.mha}
Expand Down
19 changes: 6 additions & 13 deletions wasm/typescript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions wasm/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@shoelace-style/shoelace": "^2.5.2",
"@types/node": "^20.2.5",
"ava": "^5.3.1",
"cypress": "^13.2.0",
"cypress": "^13.7.3",
"debug": "^4.3.4",
"itk-image-io": "^1.0.0-b.146",
"rollup": "^3.9.0",
Expand All @@ -70,4 +70,4 @@
"type": "git",
"url": "https://github.com/InsightSoftwareConsortium/ITKElastix"
}
}
}

0 comments on commit 99a1d74

Please sign in to comment.