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

Remove workaround for injecting builtins to exec scope #483

Merged

Conversation

martinRenou
Copy link
Member

Fixes #339

@martinRenou martinRenou force-pushed the remove_exec_builtins_workaround branch from 227cc78 to b10b911 Compare September 10, 2021 08:42
@martinRenou martinRenou force-pushed the remove_exec_builtins_workaround branch from b10b911 to 6344649 Compare September 10, 2021 08:43
@martinRenou martinRenou merged commit 172c6c1 into jupyter-xeus:master Sep 10, 2021
@martinRenou martinRenou deleted the remove_exec_builtins_workaround branch September 10, 2021 08:58
@SylvainCorlay
Copy link
Member

@meeseeksdev backport to 0.12.x

@lumberbot-app
Copy link

lumberbot-app bot commented Sep 14, 2021

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 0.12.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 172c6c1c9af6f7534222bc195b9ce0292145603c
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #483: Remove workaround for injecting builtins to exec scope'
  1. Push to a named branch :
git push YOURFORK 0.12.x:auto-backport-of-pr-483-on-0.12.x
  1. Create a PR against branch 0.12.x, I would have named this PR:

"Backport PR #483 on branch 0.12.x (Remove workaround for injecting builtins to exec scope)"

And apply the correct labels and milestones.

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

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

If these instruction 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.

Remove py::exec workaround
2 participants