Merged
Conversation
…cit_length_sequences DICOM: fix multiframe encoding with explicit length sequences
Docs: Explicitly specify English language to Sphinx
ReadTheDocs: updates to fix render
This also falls back to using the (deprecated) imp module to support Python < 3.5
add support for python importlib to locate MRtrix3 python libraries
See discussion on #2747
This is to avoid failures on macos (where this test was previously being performed) due to the python distutils package now being deprecated and no longer available on homebrew.
configure: revert to -isystem rather than -idirafter
Update header copyright to 2024
Allow filename in write_mrtrix.m to be string or char array
Docs: New page on MRView "lock to image axes"
Multiple occurrences of "-Wunused-but-set-variable" that appeared on Mac OSX GitHub CI.
- For mrcolour, output images are clamped to [0.0,1.0] range, so use absolute tolerance rather than fractional. - Increase tolerance on tckresample -step_size given the imprecision of the resampling operation itself.
CI: Fixes for MacOSX ARM64 runner
Conflicts: .github/workflows/checks.yml bin/dwicat build cmd/dwi2mask.cpp cmd/fod2fixel.cpp configure core/app.cpp core/file/dicom/element.cpp core/file/tiff.cpp core/file/tiff.h core/filter/dwi_brain_mask.h core/filter/fft.h core/fixel/types.h core/formats/tiff.cpp core/image_io/fetch_store.cpp core/image_io/fetch_store.h core/image_io/tiff.cpp docs/reference/commands/dwibiascorrect.rst docs/reference/commands/dwinormalise.rst package_mrtrix python/bin/mrtrix3.py run_tests src/dwi/directions/set.cpp src/gui/mrview/file_open.cpp src/gui/mrview/file_open.h src/gui/shview/file_open.h src/registration/transform/robust.cpp src/stats/permstack.cpp src/stats/permstack.h testing/cmd/testing_diff_fixel_old.cpp testing/cmd/testing_diff_matrix.cpp testing/cmd/testing_diff_mesh.cpp testing/cmd/testing_diff_peaks.cpp testing/cmd/testing_diff_tck.cpp testing/cmd/testing_diff_tsf.cpp testing/cmd/testing_unit_tests_bitset.cpp testing/cmd/testing_unit_tests_icls.cpp testing/cmd/testing_unit_tests_ordered_queue.cpp testing/cmd/testing_unit_tests_parse_ints.cpp testing/cmd/testing_unit_tests_shuffle.cpp testing/src/diff_images.h testing/src/unit_tests/tractography/roi_unit_tests.h testing/src/unit_tests/unit_test.h
Lestropie
added a commit
that referenced
this pull request
May 7, 2024
|
clang-tidy review says "All clean, LGTM! 👍" |
|
clang-tidy review says "All clean, LGTM! 👍" |
Member
Author
|
I've done a manual cross-reference of the changeset against the underlying commits, and found one small glitch from manual merge conflict resolution in |
|
clang-tidy review says "All clean, LGTM! 👍" |
31 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Attempting to merge the latest changes on
masteronto thedevbranch.Will need to cross-check the commits with the proposed changes, make sure that merge commit 3d4f392 doesn't accidentally revert anything.
For the record, I accidentally created merge commit 3d4f392 on my local
devbranch, pushed it, and GitHub actually accepted it, with the following message:I then couldn't force-push GitHub's
devback one commit because of being locked against force pushes. For now, I've gotten around this by giving myself and @jdtournier the ability to force push todev. However GitHub should not have accepted that commit in the first place according to the branch settings.