Skip to content

Commit

Permalink
ENH: Update CI for ITK 5.4 RC 04
Browse files Browse the repository at this point in the history
  • Loading branch information
dzenanz committed Apr 19, 2024
1 parent b354335 commit c000499
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: true
AlignEscapedNewlines: Right
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
# clang 9.0 AllowAllArgumentsOnNextLine: true
Expand Down
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# http://EditorConfig.org
# https://EditorConfig.org

# top-most EditorConfig file
root = true
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/build-test-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@ on: [push,pull_request]

jobs:
cxx-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@246883ef3828fc00219145aeec9efa67b9889d0b
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-cxx.yml@df1df6398389fa1a99d169b1264b9647d2164dd0
with:
cmake-options: "Module_Montage_BUILD_EXAMPLES:BOOL=ON"

python-build-workflow:
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@246883ef3828fc00219145aeec9efa67b9889d0b
uses: InsightSoftwareConsortium/ITKRemoteModuleBuildTestPackageAction/.github/workflows/build-test-package-python.yml@df1df6398389fa1a99d169b1264b9647d2164dd0
with:
manylinux-platforms: '["_2_28-x64","2014-x64"]'
test-notebooks: true
secrets:
pypi_password: ${{ secrets.pypi_password }}
3 changes: 2 additions & 1 deletion .github/workflows/clang-format-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- uses: InsightSoftwareConsortium/ITKClangFormatLinterAction@master
9 changes: 4 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# -*- coding: utf-8 -*-
from __future__ import print_function
from os import sys

try:
Expand All @@ -13,7 +12,7 @@

setup(
name='itk-montage',
version='0.8.1',
version='0.8.2',
author='Dženan Zukić, Matt McCormick',
author_email='[email protected]',
packages=['itk'],
Expand Down Expand Up @@ -48,9 +47,9 @@
keywords='ITK InsightToolkit Montage Image-stitching Image-montage',
url=r'https://github.com/InsightSoftwareConsortium/ITKMontage',
install_requires=[
r'itk-core>=v5.3.0',
r'itk-filtering>=v5.3.0',
r'itk-io>=v5.3.0',
r'itk-core>=v5.4rc4',
r'itk-filtering>=v5.4rc4',
r'itk-io>=v5.4rc4',
r'numpy'
]
)

0 comments on commit c000499

Please sign in to comment.