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] Change error string to match scikit-learn InvalidParameterError message #3763

Merged
merged 2 commits into from Jun 19, 2023

Conversation

ymzayek
Copy link
Member

@ymzayek ymzayek commented Jun 16, 2023

@github-actions
Copy link
Contributor

👋 @ymzayek 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 16, 2023

Codecov Report

Merging #3763 (c6c001f) into main (f16dcb4) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #3763   +/-   ##
=======================================
  Coverage   91.54%   91.54%           
=======================================
  Files         139      139           
  Lines       16591    16591           
  Branches     3244     3244           
=======================================
  Hits        15188    15188           
  Misses       1402     1402           
  Partials        1        1           

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

@ymzayek ymzayek requested a review from Remi-Gau June 19, 2023 09:22
Copy link
Collaborator

@Remi-Gau Remi-Gau left a comment

Choose a reason for hiding this comment

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

LGTM
thanks @ymzayek

@ymzayek
Copy link
Member Author

ymzayek commented Jun 19, 2023

Merging this

@ymzayek ymzayek merged commit bfc435a into nilearn:main Jun 19, 2023
29 checks passed
@ymzayek ymzayek deleted the fix-sklearn-error branch June 19, 2023 14:54
Remi-Gau pushed a commit to Remi-Gau/nilearn that referenced this pull request Jun 19, 2023
…r` message (nilearn#3763)

* Modify ValueError string

* Warning based on sklearn version
Remi-Gau added a commit that referenced this pull request Jun 20, 2023
* add workflow for flynt

* configure and run flynt

* flake8

* Update .github/workflows/f_strings.yml

Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>

* Update nilearn/_utils/data_gen.py

Co-authored-by: bthirion <bertrand.thirion@inria.fr>

* pre-commit hooks auto-update (#3764)

Co-authored-by: Remi-Gau <Remi-Gau@users.noreply.github.com>

* [DOC] update changelog and git blame ignore (#3755)

* update git-blame-ignore

* update changelog

* fix

* update ignore

* fix regex escape

* flake8

* use list and not set

* simplify rev file

* rm spaces

* pragmatism wins

* rm import

* reset plotting files

* [FIX] Change error string to match scikit-learn `InvalidParameterError` message (#3763)

* Modify ValueError string

* Warning based on sklearn version

* relax regex for warning on sanitize reorder error (#3766)

---------

Co-authored-by: Yasmin <63292494+ymzayek@users.noreply.github.com>
Co-authored-by: bthirion <bertrand.thirion@inria.fr>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Remi-Gau <Remi-Gau@users.noreply.github.com>
bmwiedemann pushed a commit to bmwiedemann/openSUSE that referenced this pull request Sep 30, 2023
https://build.opensuse.org/request/show/1103307
by user dgarcia + dimstar_suse
- Add numpy-1.25.patch, upstream patch gh#nilearn/nilearn#3746
- Add warning-based-sklearn-version.patch, upstream patch gh#nilearn/nilearn#3763
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.

None yet

2 participants