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

Reverts #3689 and #3738 back to the original working codebase #3830

Merged
merged 4 commits into from
Sep 12, 2023

Conversation

martinRenou
Copy link
Member

@martinRenou martinRenou commented Sep 11, 2023

Reverts #3689 and #3738

As discussed in #3735. We should probably revert those in a patch release, then be back with a solution that works nicely later.

@github-actions
Copy link

Binder 👈 Launch a binder notebook on branch jupyter-widgets/ipywidgets/revert-3689-patch-1

@martinRenou martinRenou changed the title Revert "fix: deepcopy with structuredClone over JSON.parse/stringify" Reverts #3689 and #3738 back to the original working codebase Sep 11, 2023
@martinRenou martinRenou changed the title Reverts #3689 and #3738 back to the original working codebase Reverts https://github.com/jupyter-widgets/ipywidgets/pull/3689 and https://github.com/jupyter-widgets/ipywidgets/pull/3738 back to the original working codebase Sep 11, 2023
@martinRenou martinRenou changed the title Reverts https://github.com/jupyter-widgets/ipywidgets/pull/3689 and https://github.com/jupyter-widgets/ipywidgets/pull/3738 back to the original working codebase Reverts #3689 and #3738 back to the original working codebase Sep 11, 2023
@ibdafna ibdafna merged commit 2c76d22 into main Sep 12, 2023
28 checks passed
@martinRenou martinRenou deleted the revert-3689-patch-1 branch September 12, 2023 15:35
@martinRenou
Copy link
Member Author

meeseeksdev please backport to 7.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 12, 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.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 2c76d22d688d3b61b65a08dd0046df0c4a65ea77
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #3830: Reverts #3689 and #3738 back to the original working codebase'
  1. Push to a named branch:
git push YOURFORK 7.x:auto-backport-of-pr-3830-on-7.x
  1. Create a PR against branch 7.x, I would have named this PR:

"Backport PR #3830 on branch 7.x (Reverts #3689 and #3738 back to the original working codebase)"

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.

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