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

[FIX] find confounds even when BIDS derivatives bold files contain res or den entities #3742

Merged
merged 11 commits into from Jun 14, 2023

Conversation

Remi-Gau
Copy link
Collaborator

@Remi-Gau Remi-Gau commented Jun 1, 2023

Fixes #3741

Changes proposed in this pull request:

  • make test for first_level_from_bids more stringent by checking the types of the output values
  • fix bug by not allowing any derivative entities when filtering for confounds

@github-actions
Copy link
Contributor

github-actions bot commented Jun 1, 2023

👋 @Remi-Gau Thanks for creating a PR!

Until this PR is ready for review, you can include the [WIP] tag in its title, or leave it as a github draft.

Please make sure it is compliant with our contributing guidelines. In particular, be sure it checks the boxes listed below.

  • PR has an interpretable title.
  • PR links to Github issue with mention Closes #XXXX (see our documentation on PR structure)
  • Code is PEP8-compliant (see our documentation on coding style)
  • Changelog or what's new entry in doc/changes/latest.rst (see our documentation on PR structure)

For new features:

  • There is at least one unit test per new function / class (see our documentation on testing)
  • The new feature is demoed in at least one relevant example.

For bug fixes:

  • There is at least one test that would fail under the original bug conditions.

We will review it as quick as possible, feel free to ping us with questions if needed.

@codecov
Copy link

codecov bot commented Jun 1, 2023

Codecov Report

Merging #3742 (e1b0376) into main (4493330) will decrease coverage by 0.07%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #3742      +/-   ##
==========================================
- Coverage   91.60%   91.54%   -0.07%     
==========================================
  Files         139      139              
  Lines       16593    16591       -2     
  Branches     3244     3244              
==========================================
- Hits        15200    15188      -12     
- Misses       1390     1402      +12     
+ Partials        3        1       -2     
Impacted Files Coverage Δ
nilearn/glm/first_level/first_level.py 96.78% <ø> (-0.02%) ⬇️
nilearn/_utils/data_gen.py 98.43% <100.00%> (ø)

... and 5 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@Remi-Gau Remi-Gau changed the title [FIX] find confounds even when BIDS derivatives datasets contain derivatives entitities [FIX] find confounds even when BIDS derivatives datasets contain derivatives entities Jun 1, 2023
@Remi-Gau Remi-Gau marked this pull request as ready for review June 12, 2023 12:26
@Remi-Gau Remi-Gau changed the title [FIX] find confounds even when BIDS derivatives datasets contain derivatives entities [FIX] find confounds even when BIDS derivatives bold files contain res or den entities Jun 12, 2023
Copy link
Member

@bthirion bthirion left a comment

Choose a reason for hiding this comment

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

LGTM, thx

@Remi-Gau Remi-Gau added the BIDS label Jun 13, 2023
@Remi-Gau Remi-Gau requested a review from ymzayek June 14, 2023 08:17
Copy link
Member

@ymzayek ymzayek left a comment

Choose a reason for hiding this comment

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

LGTM! Minor comments

nilearn/glm/tests/test_first_level.py Outdated Show resolved Hide resolved
doc/changes/latest.rst Outdated Show resolved Hide resolved
@Remi-Gau
Copy link
Collaborator Author

all green

merging

@Remi-Gau Remi-Gau merged commit f16dcb4 into nilearn:main Jun 14, 2023
29 checks passed
@Remi-Gau Remi-Gau deleted the fix-res_den_for_confounds branch July 7, 2023 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] first_level_from_bids confused by "res" filter when looking for confounds.tsv
3 participants