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] ensure that dataframes can be used as input for second level GLM (estimation and contrast) #3879

Merged
merged 7 commits into from Aug 7, 2023

Conversation

Remi-Gau
Copy link
Collaborator

@Remi-Gau Remi-Gau commented Aug 3, 2023

Changes proposed in this pull request:

  • add regression test
  • implement fix suggested by gurraburra

@github-actions
Copy link
Contributor

github-actions bot commented Aug 3, 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.

@Remi-Gau Remi-Gau marked this pull request as ready for review August 3, 2023 16:06
@codecov
Copy link

codecov bot commented Aug 3, 2023

Codecov Report

Merging #3879 (d41b0c2) into main (5734dba) will increase coverage by 0.00%.
Report is 5 commits behind head on main.
The diff coverage is 100.00%.

@@           Coverage Diff           @@
##             main    #3879   +/-   ##
=======================================
  Coverage   91.60%   91.61%           
=======================================
  Files         134      134           
  Lines       15713    15722    +9     
  Branches     3271     3273    +2     
=======================================
+ Hits        14394    14403    +9     
  Misses        770      770           
  Partials      549      549           
Flag Coverage Δ
macos-latest_3.10 91.53% <100.00%> (+<0.01%) ⬆️
macos-latest_3.11 91.53% <100.00%> (+<0.01%) ⬆️
macos-latest_3.8 91.49% <100.00%> (+<0.01%) ⬆️
macos-latest_3.9 91.49% <100.00%> (+<0.01%) ⬆️
ubuntu-latest_3.10 91.53% <100.00%> (?)
ubuntu-latest_3.11 91.53% <100.00%> (+<0.01%) ⬆️
ubuntu-latest_3.8 91.49% <100.00%> (+<0.01%) ⬆️
ubuntu-latest_3.9 91.49% <100.00%> (+<0.01%) ⬆️
windows-latest_3.10 91.47% <100.00%> (+<0.01%) ⬆️
windows-latest_3.11 91.47% <100.00%> (+<0.01%) ⬆️
windows-latest_3.8 91.44% <100.00%> (?)
windows-latest_3.9 91.44% <100.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
nilearn/glm/second_level/second_level.py 96.39% <100.00%> (-0.02%) ⬇️

... and 1 file with indirect coverage changes

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

doc/changes/latest.rst Outdated Show resolved Hide resolved
nilearn/glm/tests/test_second_level.py Outdated Show resolved Hide resolved
Remi-Gau and others added 2 commits August 4, 2023 13:06
Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
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 merged commit 960de1e into nilearn:main Aug 7, 2023
29 checks passed
@Remi-Gau Remi-Gau deleted the scd_lvl_df branch August 7, 2023 10:30
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.

[BUG] cannot use dataframe as input for second level GLM
3 participants