Skip to content

Commit 99a1d74

Browse files
authored
Merge pull request #278 from InsightSoftwareConsortium/itk-5.4rc03
Itk 5.4rc03+patches+pyproject.toml-stable-abi-wheels--macos-arm
2 parents f1b09e5 + 429fd5f commit 99a1d74

File tree

6 files changed

+128
-73
lines changed

6 files changed

+128
-73
lines changed

.github/workflows/build-test-package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ on: [push,pull_request]
44

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

99
python-build-workflow-dev:
1010
if: github.ref != 'refs/heads/master' && github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags')
11-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@3f63de316255a285b0cac4c819d3d45649738999
11+
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@e15be287b1e1940b51e38fd6c8e0a32cfe629154
1212
with:
1313
python3-minor-versions: '["8","11"]'
1414
manylinux-platforms: '["_2_28-x64","2014-x64"]'
1515
test-notebooks: true
1616
secrets:
1717
pypi_password: ${{ secrets.pypi_password }}
18-
18+
1919
python-build-workflow-main:
2020
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags')
21-
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@3f63de316255a285b0cac4c819d3d45649738999
21+
uses: thewtex/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@e15be287b1e1940b51e38fd6c8e0a32cfe629154
2222
with:
2323
python3-minor-versions: '["8","9","10","11"]'
2424
manylinux-platforms: '["_2_28-x64","2014-x64"]'

pyproject.toml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
[build-system]
2+
requires = ["scikit-build-core"]
3+
build-backend = "scikit_build_core.build"
4+
5+
[project]
6+
name = "itk-elastix"
7+
version = "0.19.2"
8+
description = "Provides an ITK Python interface to elastix, a toolbox for rigid and nonrigid registration of images"
9+
readme = "README.md"
10+
license = {file = "LICENSE"}
11+
authors = [
12+
{ name = "Matthew M. McCormick", email = "matt.mccormick@kitware.com" },
13+
{ name = "ViktorvdValk", email = "viktorvandervalk@gmail.com" },
14+
{ name = "Niels Dekker", email = "N.Dekker@lumc.nl" },
15+
{ name = "Tom Birdsong" },
16+
{ name = "Konstantinos Ntatsis", email = "konstantinos.ntatsis323@gmail.com" },
17+
]
18+
keywords = [
19+
"itk",
20+
"elastix",
21+
"registration",
22+
]
23+
classifiers = [
24+
"Development Status :: 4 - Beta",
25+
"Intended Audience :: Developers",
26+
"Intended Audience :: Education",
27+
"Intended Audience :: Healthcare Industry",
28+
"Intended Audience :: Science/Research",
29+
"License :: OSI Approved :: Apache Software License",
30+
"Operating System :: Android",
31+
"Operating System :: MacOS",
32+
"Operating System :: Microsoft :: Windows",
33+
"Operating System :: POSIX",
34+
"Operating System :: Unix",
35+
"Programming Language :: C++",
36+
"Programming Language :: Python",
37+
"Topic :: Scientific/Engineering",
38+
"Topic :: Scientific/Engineering :: Information Analysis",
39+
"Topic :: Scientific/Engineering :: Medical Science Apps.",
40+
"Topic :: Software Development :: Libraries",
41+
]
42+
requires-python = ">=3.8"
43+
dependencies = [
44+
"itk>=5.4rc3",
45+
]
46+
47+
[project.urls]
48+
Download = "https://github.com/InsightSoftwareConsortium/ITKElastix"
49+
Homepage = "https://github.com/InsightSoftwareConsortium/ITKElastix"
50+
51+
[tool.scikit-build]
52+
# The versions of CMake to allow. If CMake is not present on the system or does
53+
# not pass this specifier, it will be downloaded via PyPI if possible. An empty
54+
# string will disable this check.
55+
cmake.version = ">=3.16.3"
56+
57+
# A list of args to pass to CMake when configuring the project. Setting this in
58+
# config or envvar will override toml. See also ``cmake.define``.
59+
cmake.args = []
60+
61+
# A table of defines to pass to CMake when configuring the project. Additive.
62+
cmake.define = {}
63+
64+
# Verbose printout when building.
65+
cmake.verbose = true
66+
67+
# The build type to use when building the project. Valid options are: "Debug",
68+
# "Release", "RelWithDebInfo", "MinSizeRel", "", etc.
69+
cmake.build-type = "Release"
70+
71+
# The source directory to use when building the project. Currently only affects
72+
# the native builder (not the setuptools plugin).
73+
cmake.source-dir = "."
74+
75+
# The versions of Ninja to allow. If Ninja is not present on the system or does
76+
# not pass this specifier, it will be downloaded via PyPI if possible. An empty
77+
# string will disable this check.
78+
ninja.version = ">=1.11"
79+
80+
# The logging level to display, "DEBUG", "INFO", "WARNING", and "ERROR" are
81+
# possible options.
82+
logging.level = "INFO"
83+
84+
# Files to include in the SDist even if they are skipped by default. Supports
85+
# gitignore syntax.
86+
sdist.include = []
87+
88+
# Files to exclude from the SDist even if they are included by default. Supports
89+
# gitignore syntax.
90+
sdist.exclude = []
91+
92+
# A list of license files to include in the wheel. Supports glob patterns.
93+
wheel.license-files = ["LICEN[CS]E*",]
94+
95+
# Target the platlib or the purelib. If not set, the default is to target the
96+
# platlib if wheel.cmake is true, and the purelib otherwise.
97+
wheel.platlib = "false"
98+
99+
# If CMake is less than this value, backport a copy of FindPython. Set to 0
100+
# disable this, or the empty string.
101+
backport.find-python = "3.26.1"
102+
103+
# Select the editable mode to use. Can be "redirect" (default) or "inplace".
104+
editable.mode = "redirect"
105+
106+
# Rebuild the project when the package is imported. The build-directory must be
107+
# set.
108+
editable.rebuild = false
109+
110+
# If set, this will provide a method for backward compatibility.
111+
minimum-version = "0.8.2"
112+
113+
# The build directory. Defaults to a temporary directory, but can be set.
114+
build-dir = "build/{wheel_tag}"

setup.py

Lines changed: 0 additions & 54 deletions
This file was deleted.

test/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ CreateTestDriver(Elastix "${Elastix-Test_LIBRARIES}" "${ElastixTests}")
99
itk_add_test(NAME itkElastixRegistrationMethodTest
1010
COMMAND ElastixTestDriver
1111
--compareNumberOfPixelsTolerance 25
12+
--compareRadiusTolerance 3
13+
--compareIntensityTolerance 50
1214
--compare
1315
${ITK_TEST_OUTPUT_DIR}/itkElastixRegistrationMethodTestOutput.mha
1416
DATA{Baseline/itkElastixRegistrationMethodTestOutput.mha}

wasm/typescript/package-lock.json

Lines changed: 6 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wasm/typescript/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"@shoelace-style/shoelace": "^2.5.2",
5252
"@types/node": "^20.2.5",
5353
"ava": "^5.3.1",
54-
"cypress": "^13.2.0",
54+
"cypress": "^13.7.3",
5555
"debug": "^4.3.4",
5656
"itk-image-io": "^1.0.0-b.146",
5757
"rollup": "^3.9.0",
@@ -70,4 +70,4 @@
7070
"type": "git",
7171
"url": "https://github.com/InsightSoftwareConsortium/ITKElastix"
7272
}
73-
}
73+
}

0 commit comments

Comments
 (0)