Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAINT: Raise minimum to 3.10, bump actions #337

Merged
merged 7 commits into from
Jan 29, 2024
Merged

Conversation

mgxd
Copy link
Collaborator

@mgxd mgxd commented Jan 29, 2024

No description provided.

Copy link

codecov bot commented Jan 29, 2024

Codecov Report

Attention: 14 lines in your changes are missing coverage. Please review.

Comparison is base (c1126ae) 32.80% compared to head (da0eb1d) 33.07%.

Files Patch % Lines
nibabies/cli/workflow.py 0.00% 3 Missing ⚠️
nibabies/data/__init__.py 93.93% 2 Missing ⚠️
nibabies/utils/misc.py 33.33% 2 Missing ⚠️
nibabies/workflows/anatomical/brain_extraction.py 0.00% 2 Missing ⚠️
nibabies/workflows/anatomical/resampling.py 33.33% 2 Missing ⚠️
nibabies/workflows/anatomical/surfaces.py 66.66% 1 Missing ⚠️
nibabies/workflows/bold/registration.py 66.66% 1 Missing ⚠️
nibabies/workflows/bold/resampling.py 50.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master     #337      +/-   ##
==========================================
+ Coverage   32.80%   33.07%   +0.27%     
==========================================
  Files          55       55              
  Lines        5313     5333      +20     
==========================================
+ Hits         1743     1764      +21     
+ Misses       3570     3569       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

nibabies/cli/workflow.py Outdated Show resolved Hide resolved
@@ -33,5 +35,5 @@ def data_dir():
@pytest.fixture(autouse=True)
def set_namespace(doctest_namespace, data_dir):
doctest_namespace["data_dir"] = data_dir
doctest_namespace["test_data"] = Path(resource_filename("nibabies", "tests/data"))
doctest_namespace["test_data"] = load_data.as_path('.')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
doctest_namespace["test_data"] = load_data.as_path('.')
doctest_namespace["test_data"] = load_data()

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the intended path is actually nibabies.tests.data, it seems to be happy with load_data.cached('../tests/data')

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough. I generally just instantiate a new loader in tests/data/__init__.

@mgxd mgxd merged commit b0a2778 into nipreps:master Jan 29, 2024
10 checks passed
@mgxd mgxd deleted the ci/actions branch January 29, 2024 22:43
mgxd added a commit that referenced this pull request Aug 30, 2024
24.0.0 (August 29, 2024)

This major release includes a substantial refactoring of the pipeline.

One key addition is the addition of the `--level` flag, which can take the arguments minimal, resampling or full. The default is full, which should produce nearly the same results as previous versions. minimal will produce only the minimum necessary to deterministically generate the remaining derivatives. resampling will produce some additional derivatives, intended to simplify resampling with other tools.

The `--derivatives` flag was altered to take arguments in the form `name=/path/to/dir`.
For each directory provided, if a derivative is found - it will be used instead of computing it from scratch. If a derivative is not found, NiBabies will compute it and proceed as usual.

Taken together, these features can allow a dataset provider to run a minimal NiBabies run, targeting many output spaces, while a user can then run a `--derivatives` run to generate additional derivatives in only the output spaces they need. Another use case is to provide an precomputed derivative to override the default NiBabies behavior, enabling easier workarounds for bugs or experimentation with alternatives.

Another new feature is a dynamic anatomical reference, which is set based on surface reconstruction method or through the `--reference-anatomical` flag. Previously, T1w was the default output space. Now, the reference anatomical is determined based on the surface reconstruction method.

Additionally, minor adjustments have been made to MCRIBS surface reconstruction to address failure rates. This is still an on-going investigation, but preliminary results look promising.

This release resolves a number of issues with fieldmaps inducing distortions during correction. Phase difference and direct fieldmaps are now masked correctly, preventing the overestimation of distortions outside the brain. Additionally, we now implement Jacobian weighting during unwarping, which corrects for compression and expansion effects on signal intensity. To disable Jacobian weighting, add `fmap-jacobian` to the `--ignore` argument.

Finally, a new resampling method has been added, to better account for susceptibility distortion and motion in a single shot resampling to a volumetric target space. We anticipate extending this to surface targets in the future.

  * FIX: nest pathlib import in fix_multi_source_name (#365)
  * FIX: Avoid retrieving multiple templates from latest TF (#353)
  * FIX: Raise informative error if no t1w or t2w found (#347)
  * FIX: Easier pyenv usage (#342)
  * FIX: Catch nonexistent derivatives, clean up subworkflow logic (#336)
  * FIX: Use fsLR reg sphere for MCRIBS morphometrics resampling (#334)
  * FIX: T2star map MNI scaling (#320)

  * ENH: Alter outputs when MCRIBS reconstruction is used (#329)
  * ENH: Use nireports for Report generation + add reportlet per reconstruction (#328)
  * ENH: better repr for Derivatives class (#351)

  * RF: Move to fit/apply workflow (#360)
  * RF: Replace `resource_filename` with `load_data` (#345)

  * MAINT: Bump urllib3 from 2.0.3 to 2.0.7 (#319)
  * MAINT: Raise minimum to 3.10, bump actions (#337)
  * MAINT: Bump pillow from 9.5.0 to 10.0.1 (#317)
  * MAINT: Update to latest migas API (#326)

  * DOC: Use correct argument flag (#338)
  * DOC: Move to new theme, add outputs description (#383)
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.

2 participants