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

Update ruff config and typing #7145

Merged
merged 2 commits into from
Nov 10, 2023
Merged

Conversation

blink1073
Copy link
Contributor

No description provided.

Copy link
Contributor

Binder 👈 Launch a Binder on branch blink1073/notebook/update-ruff-config

@blink1073 blink1073 merged commit 29d665d into jupyter:main Nov 10, 2023
31 checks passed
@blink1073 blink1073 deleted the update-ruff-config branch November 10, 2023 01:53
@jtpio jtpio added this to the 7.1 milestone Nov 13, 2023
@jtpio jtpio modified the milestones: 7.1, 7.0.x Dec 13, 2023
@jtpio
Copy link
Member

jtpio commented Dec 13, 2023

@meeseeksdev please backport to 7.0.x

Copy link

lumberbot-app bot commented Dec 13, 2023

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.0.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 29d665dbac144d143d843168da9823cab6498b0a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #7145: Update ruff config and typing'
  1. Push to a named branch:
git push YOURFORK 7.0.x:auto-backport-of-pr-7145-on-7.0.x
  1. Create a PR against branch 7.0.x, I would have named this PR:

"Backport PR #7145 on branch 7.0.x (Update ruff config and typing)"

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.

jtpio pushed a commit to jtpio/notebook that referenced this pull request Dec 13, 2023
jtpio added a commit that referenced this pull request Dec 13, 2023
(cherry picked from commit 29d665d)

Co-authored-by: Steven Silvester <[email protected]>
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.

2 participants