Skip to content

Merge dev into master#32

Merged
tctco merged 47 commits into
masterfrom
merge/dev-into-master
Jun 21, 2026
Merged

Merge dev into master#32
tctco merged 47 commits into
masterfrom
merge/dev-into-master

Conversation

@tctco

@tctco tctco commented Jun 21, 2026

Copy link
Copy Markdown
Owner

Summary

  • Merge dev into master after testing, bringing in the v4.2.x core refactor, iterative rigid alignment, BIDS batch support, Docker build environment, and legacy glibc Linux build path.
  • Resolved merge conflicts in CI workflow, README, conanfile, gitignore, and rigid.onnx.
  • Preserved master-only additions such as CITATION.cff.

Conflict resolution notes

  • .github/workflows/cross-compile.yml: kept dev's tag-only packaging guards for release artifacts.
  • README.md: merged dev's NeuroImage publication updates and implemented metric docs; kept master content where compatible.
  • localizer/src/conanfile.py: kept dev version (4.2.3-alpha) and combined hwloc workaround comments.
  • rigid.onnx: kept dev's updated model.
  • .gitignore: kept both master template notebook ignores and dev .codex ignore.

Test plan

  • Wait for CI on this PR (Linux/Windows smoke tests)
  • Verify release packaging still works on tag builds
  • Spot-check --version and CLI help after merge

Made with Cursor

tctco and others added 30 commits November 29, 2025 23:27
…/linux

Fix ONNX path conversion for non-Windows builds
Add unit tests for MetricCalculatorLogic command building
…t-images

Add `rigid` subcommand for rigid-only alignment
@tctco tctco merged commit e4fcdff into master Jun 21, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant