Skip to content

Backport PR #13651 on branch v5.0.x (MNT: Fix test compat with scipy 1.10.0) - #13654

Merged
pllim merged 1 commit into
astropy:v5.0.xfrom
meeseeksmachine:auto-backport-of-pr-13651-on-v5.0.x
Sep 13, 2022
Merged

pllim merged 1 commit into
astropy:v5.0.xfrom
meeseeksmachine:auto-backport-of-pr-13651-on-v5.0.x

Conversation

@meeseeksmachine

Copy link
Copy Markdown

Backport PR #13651: MNT: Fix test compat with scipy 1.10.0

Comment on lines +1142 to +1147
if SCIPY_LT_1_10:
import scipy.misc
scipy_data = scipy.misc.ascent()
else:
import scipy.datasets
scipy_data = scipy.datasets.ascent()

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Suggested change
if SCIPY_LT_1_10:
import scipy.misc
scipy_data = scipy.misc.ascent()
else:
import scipy.datasets
scipy_data = scipy.datasets.ascent()
if SCIPY_LT_1_10:
scipy_data = scipy.misc.ascent()
else:
scipy_data = scipy.datasets.ascent()

Seems both submodules are already imported by default.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Oh oops... I will merge this and then create a follow-up PR and backport that too. Good catch!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

See #13657

@pllim
pllim merged commit faae335 into astropy:v5.0.x Sep 13, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants