Skip to content

fix: ascent is now in scipy.datasets instead of scipy.misc#1670

Merged
maartenbreddels merged 1 commit intobqplot:0.12.xfrom
maartenbreddels:fix_scipy_deprecation
Feb 11, 2025
Merged

fix: ascent is now in scipy.datasets instead of scipy.misc#1670
maartenbreddels merged 1 commit intobqplot:0.12.xfrom
maartenbreddels:fix_scipy_deprecation

Conversation

@maartenbreddels
Copy link
Copy Markdown
Member

@maartenbreddels maartenbreddels commented Feb 11, 2025

@maartenbreddels maartenbreddels merged commit e6eea0f into bqplot:0.12.x Feb 11, 2025
9 checks passed
@maartenbreddels
Copy link
Copy Markdown
Member Author

meeseeksdev please backport to master

@lumberbot-app
Copy link
Copy Markdown

lumberbot-app bot commented Feb 11, 2025

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout master
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 e6eea0f69d8c8fe41bdab28d8345460935aec800
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #1670: fix: ascent is now in scipy.datasets instead of scipy.misc'
  1. Push to a named branch:
git push YOURFORK master:auto-backport-of-pr-1670-on-master
  1. Create a PR against branch master, I would have named this PR:

"Backport PR #1670 on branch master (fix: ascent is now in scipy.datasets instead of scipy.misc)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

maartenbreddels added a commit to maartenbreddels/bqplot that referenced this pull request Feb 11, 2025
maartenbreddels added a commit to maartenbreddels/bqplot that referenced this pull request Feb 11, 2025
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.

1 participant