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

[ENH]: Remove decorator from glm/regression #3921

Merged
merged 7 commits into from Aug 23, 2023

Conversation

achamma723
Copy link
Contributor

Closes #3903

@github-actions
Copy link
Contributor

👋 @achamma723 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 Aug 22, 2023

Codecov Report

Merging #3921 (202e32d) into main (0d70562) will increase coverage by 0.03%.
Report is 2 commits behind head on main.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main    #3921      +/-   ##
==========================================
+ Coverage   91.73%   91.77%   +0.03%     
==========================================
  Files         134      134              
  Lines       15738    15728      -10     
  Branches     3275     3274       -1     
==========================================
- Hits        14437    14434       -3     
+ Misses        758      751       -7     
  Partials      543      543              
Flag Coverage Δ
macos-latest_3.10 91.68% <ø> (+0.03%) ⬆️
macos-latest_3.11 91.68% <ø> (+0.03%) ⬆️
macos-latest_3.8 91.64% <ø> (+0.03%) ⬆️
macos-latest_3.9 91.64% <ø> (+0.03%) ⬆️
ubuntu-latest_3.10 91.68% <ø> (+0.03%) ⬆️
ubuntu-latest_3.11 91.68% <ø> (+0.03%) ⬆️
ubuntu-latest_3.8 91.64% <ø> (+0.03%) ⬆️
ubuntu-latest_3.9 91.64% <ø> (+0.03%) ⬆️
windows-latest_3.10 91.62% <ø> (+0.03%) ⬆️
windows-latest_3.11 91.62% <ø> (+0.03%) ⬆️
windows-latest_3.8 91.59% <ø> (+0.03%) ⬆️
windows-latest_3.9 91.59% <ø> (+0.03%) ⬆️

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

Files Changed Coverage Δ
nilearn/glm/regression.py 78.43% <ø> (+4.32%) ⬆️

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

@ymzayek
Copy link
Member

ymzayek commented Aug 22, 2023

Thx @achamma723 ! I think minor unrelated changes went into first_level.py and test_first_level.py. It's not a big deal since it's very minimal but if you could remove those that would be great!

Comment on lines 62 to 64
- Move the `~nilearn.plotting.html_surface._mix_colormaps` to `cm.py` in :mod:`~nilearn.plotting` (:gh:`3919` by `Ahmad Chamma`_) No newline at end of file
- Remove deprecation decorator from `~nilearn.glm.regression` (:gh:`3921` by `Ahmad Chamma`_)
- Move the `~nilearn.plotting.html_surface._mix_colormaps` to `cm.py` in :mod:`~nilearn.plotting` (:gh:`3919` by `Ahmad Chamma`_)
Copy link
Member

Choose a reason for hiding this comment

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

Hm the entry from the last PR shouldn't be showing up as a change here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ymzayek True, I think it was a merge conflict. Is it good now?

- Move the `~nilearn.plotting.html_surface._mix_colormaps` to `cm.py` in :mod:`~nilearn.plotting` (:gh:`3919` by `Ahmad Chamma`_)
Copy link
Member

Choose a reason for hiding this comment

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

This should not be part of the change, but that's truly minor.

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.

Thx !

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.

@ymzayek ymzayek merged commit 0b49cc0 into nilearn:main Aug 23, 2023
29 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.

dead code: decorator for deprecated arguments
3 participants