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 jupyter_core pinning #896

Merged
merged 1 commit into from
Dec 7, 2022

Conversation

ophie200
Copy link
Contributor

@ophie200 ophie200 commented Dec 7, 2022

Fixes #897.

@davidbrochart
Copy link
Member

Fixes #262.

Wrong issue number?

@davidbrochart davidbrochart merged commit b135ada into jupyter:main Dec 7, 2022
@davidbrochart
Copy link
Member

Thanks!

@blink1073
Copy link
Contributor

@meeseeksdev please backport to 7.x

@lumberbot-app
Copy link

lumberbot-app bot commented Dec 7, 2022

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 7.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 b135adafbb364a273fe138435d185a32832544a2
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #896: Fix jupyter_core pinning'
  1. Push to a named branch:
git push YOURFORK 7.x:auto-backport-of-pr-896-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #896 on branch 7.x (Fix jupyter_core pinning)"

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.

@blink1073
Copy link
Contributor

Ah, we didn't have the same pin on the 7.x branch because we aren't using the asyncio imports from jupyter_core there.

@ophie200 ophie200 deleted the fix-jupyter-core-pinning branch December 7, 2022 21:16
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