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] resolve numpy2 compatibility related to ambiguity when broadcasting in np.solve #4350

Merged
merged 3 commits into from Apr 3, 2024

Conversation

Remi-Gau
Copy link
Collaborator

Copy link
Contributor

👋 @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.

Copy link

codecov bot commented Mar 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 92.15%. Comparing base (abb80ff) to head (2eeddc6).
Report is 43 commits behind head on main.

❗ Current head 2eeddc6 differs from pull request most recent head 2ecd9ff. Consider uploading reports for the commit 2ecd9ff to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4350      +/-   ##
==========================================
+ Coverage   91.85%   92.15%   +0.29%     
==========================================
  Files         144      143       -1     
  Lines       16419    16496      +77     
  Branches     3434     3463      +29     
==========================================
+ Hits        15082    15202     +120     
+ Misses        792      749      -43     
  Partials      545      545              
Flag Coverage Δ
macos-latest_3.10_test_plotting 91.94% <100.00%> (?)
macos-latest_3.11_test_plotting 91.94% <100.00%> (+0.09%) ⬆️
macos-latest_3.12_test_plotting 91.94% <100.00%> (?)
macos-latest_3.8_test_plotting 91.91% <100.00%> (?)
macos-latest_3.9_test_plotting 91.91% <100.00%> (?)
ubuntu-latest_3.10_test_plotting 91.94% <100.00%> (+0.09%) ⬆️
ubuntu-latest_3.11_test_plotting 91.94% <100.00%> (?)
ubuntu-latest_3.12_test_plotting 91.94% <100.00%> (?)
ubuntu-latest_3.12_test_pre 91.94% <100.00%> (?)
ubuntu-latest_3.8_test_min 68.83% <100.00%> (?)
ubuntu-latest_3.8_test_plot_min 91.61% <100.00%> (?)
ubuntu-latest_3.8_test_plotting 91.91% <100.00%> (?)
ubuntu-latest_3.9_test_plotting 91.91% <100.00%> (?)
windows-latest_3.10_test_plotting 91.92% <100.00%> (?)
windows-latest_3.11_test_plotting 91.92% <100.00%> (?)
windows-latest_3.12_test_plotting 91.92% <100.00%> (?)
windows-latest_3.8_test_plotting 91.88% <100.00%> (?)
windows-latest_3.9_test_plotting 91.89% <100.00%> (?)

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

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

@Remi-Gau
Copy link
Collaborator Author

The remaining failing test should be fixed by #4349.

@Remi-Gau Remi-Gau marked this pull request as ready for review March 30, 2024 20:43
@bthirion
Copy link
Member

bthirion commented Apr 1, 2024

Numpy2 compatibility still breaks somewhere else...

@Remi-Gau
Copy link
Collaborator Author

Remi-Gau commented Apr 2, 2024

OK this fail is related to some pandas 3.0 dependency...

@bthirion
Copy link
Member

bthirion commented Apr 2, 2024

Do you want to address it ?

@Remi-Gau
Copy link
Collaborator Author

Remi-Gau commented Apr 2, 2024

Sure but not in this PR.

@Remi-Gau Remi-Gau merged commit 76f517f into nilearn:main Apr 3, 2024
30 of 31 checks passed
@Remi-Gau Remi-Gau deleted the fix/4309 branch April 3, 2024 08:21
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.

numpy 2 test workflow failures
2 participants