Skip to content

fix doctests to support numpy 1.24#34994

Merged
vbraun merged 2 commits intosagemath:developfrom
tornaria:numpy
Feb 24, 2023
Merged

fix doctests to support numpy 1.24#34994
vbraun merged 2 commits intosagemath:developfrom
tornaria:numpy

Conversation

@tornaria
Copy link
Copy Markdown
Member

@tornaria tornaria commented Feb 6, 2023 •
edited by mkoeppe
Loading

Taken from #34816.

This is necessary when system numpy is 1.24, and a prerequiste to update numpy in sagemath.

It's probably safer at this time to merge this and leave the update for next release.

Testing: void-linux/void-packages#42048

Depends on #35015

@tornaria tornaria added this to the sage-9.8 milestone Feb 6, 2023
mkoeppe
mkoeppe approved these changes Feb 7, 2023
View reviewed changes
Copy link
Copy Markdown
Contributor

@mkoeppe mkoeppe left a comment

Choose a reason for hiding this comment

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

LGTM

@tornaria tornaria mentioned this pull request Feb 8, 2023
Merged
@vbraun vbraun self-requested a review February 19, 2023 00:45
vbraun
vbraun previously requested changes Feb 19, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@vbraun vbraun left a comment

Choose a reason for hiding this comment

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

merge conflict

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Feb 19, 2023 •
edited
Loading

Codecov Report

Base: 88.59% // Head: 88.58% // Decreases project coverage by -0.02% ⚠️

Coverage data is based on head (bf2a91c) compared to base (952a6c9).
Patch coverage: 97.05% of modified lines in pull request are covered.

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

Additional details and impacted files 
@@             Coverage Diff             @@
##           develop   #34994      +/-   ##
===========================================
- Coverage    88.59%   88.58%   -0.02%     
===========================================
  Files         2140     2140              
  Lines       396961   396958       -3     
===========================================
- Hits        351695   351651      -44     
- Misses       45266    45307      +41
Impacted Files Coverage Δ
src/sage/algebras/free_algebra_element.py 82.50% <ø> (ø)
src/sage/algebras/fusion_rings/fusion_ring.py 93.93% <ø> (ø)
src/sage/algebras/lie_algebras/free_lie_algebra.py 95.43% <ø> (ø)
src/sage/algebras/lie_algebras/lie_algebra.py 91.10% <ø> (ø)
src/sage/algebras/lie_algebras/morphism.py 90.07% <ø> (ø)
src/sage/algebras/quatalg/quaternion_algebra.py 92.68% <ø> (ø)
src/sage/categories/category_with_axiom.py 98.71% <ø> (ø)
...age/categories/finite_complex_reflection_groups.py 79.12% <ø> (ø)
src/sage/categories/homset.py 92.66% <ø> (ø)
src/sage/categories/magmas.py 97.63% <ø> (ø)
... and 170 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@tornaria tornaria force-pushed the numpy branch 2 times, most recently from 40f2e54 to 94cf96a Compare February 19, 2023 15:11
@tornaria
Copy link
Copy Markdown
Member Author

tornaria commented Feb 19, 2023

I don't know what is the merge conflict. Just in case, I rebased the two (quite small) commits on top of the current develop branch.

In fact the PR was saying I wanted to merge a lot of commits making changes to a lot of files, but I only want to merge 2 commits changing 4 files in minimal ways.

@mkoeppe
Copy link
Copy Markdown
Contributor

mkoeppe commented Feb 19, 2023

I don't know what is the merge conflict.

The merge conflict was against Volker's branch. I had fixed the conflict already by merging #35015.

@tornaria
Copy link
Copy Markdown
Member Author

tornaria commented Feb 19, 2023

I see. Two comments:
a. since merging is blocked, we don't see in a PR whether merging would be ok or not. When merging is not blocked, github will say whether the PR merges cleanly or not (see, e.g. void-linux/void-packages#42344, the message there is "This branch has no conflicts with the base branch when rebasing").
b. still, the merge conflict was against a different branch; the merge conflict detection would only work if the branch the PR is created against were the same as the branch where PR's are merged into.

The problem here is that once a very intrusive PR like #35015 is merged, we are all in the dark until that actually shows up in the develop branch.

@tornaria
doctest: fixes for numpy 1.24
6aba936
@tornaria
complex_plot: fix plot of undefined values
0195760 
Undefined values would get some random color.
Rreplace all undefined values by white.

In numpy 1.24 this avoids a runtime warning (cast of nan to uint8).
@tornaria
Copy link
Copy Markdown
Member Author

tornaria commented Feb 20, 2023

Rebased to 10.0.beta1, now it should be ok.

@github-actions
Copy link
Copy Markdown

github-actions bot commented Feb 20, 2023

Documentation preview for this PR is ready! 🎉
Built with commit: 0195760

@vbraun vbraun merged commit 27d575c into sagemath:develop Feb 24, 2023
@tornaria tornaria deleted the numpy branch March 6, 2023 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vbraun vbraun Awaiting requested review from vbraun

1 more reviewer

@mkoeppe mkoeppe mkoeppe approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c: packages: standard p: critical / 2

Projects

None yet

Milestone

sage-10.0

Development

Successfully merging this pull request may close these issues.

4 participants

@tornaria @codecov-commenter @mkoeppe @vbraun