Cherry picker bot deployed in CPython repo
Hi,
The cherry picker bot has just been deployed to CPython repo, codenamed miss-islington.
miss-islington made the very first backport PR for CPython and became a first time GitHub contributor: https://github.com/python/cpython/pull/3369
GitHub repo: https://github.com/python/miss-islington
What is this?
As part of our workflow, quite often changes made on the master branch need to be backported to the earlier versions. (for example: from master to 3.6 and 2.7)
Previously the backport has to be done manually by either a core developer or the original PR author.
With the bot, the backport PR is created automatically after the PR has been merged. A core developer will need to review the backport PR.
The issue was tracked in https://github.com/python/core-workflow/issues/8
How it works
If a PR needs to be backported to one of the maintenance branches, a core developer should apply the "needs backport to X.Y" label. Do this **before** you merge the PR.
Merge the PR
miss-islington will leave a comment on the PR, saying it is working on backporting the PR.
If there's no merge conflict, the PR should be created momentarily.
Review the backport PR created by miss-islington and merge it when you're ready.
Merge Conflicts / Problems?
In case of merge conflicts, or if a backport PR was not created within 2 minutes, it likely failed and you should do the backport manually.
Manual backport can be done using cherry_picker: https://pypi.org/project/cherry-picker/
Older merged PRs not yet backported?
At the moment, those need to be backported manually.
Don't want PR to be backported by a bot?
My recommendation is to apply the "needs backport to X.Y" **after** the PR has been merged. The label is still useful to remind ourselves that this PR still needs backporting.
Who is Miss Islington?
I found out from Wikipedia that Miss Islington is the name of the witch in Monty Python and The Holy Grail.
miss-islington has not signed the CLA!
A core dev can ignore the warning and merge the PR anyway.
Thanks!
Mariatta Wijaya
This is a great UX win for our development process. Thanks for making this happen!
Alex
On Tue, Sep 5, 2017 at 9:10 PM, Mariatta Wijaya <mariatta.wijaya@gmail.com> wrote:
Hi,
The cherry picker bot has just been deployed to CPython repo, codenamed miss-islington.
miss-islington made the very first backport PR for CPython and became a first time GitHub contributor: https://github.com/python/cpython/pull/3369
GitHub repo: https://github.com/python/miss-islington
What is this?
As part of our workflow, quite often changes made on the master branch need to be backported to the earlier versions. (for example: from master to 3.6 and 2.7)
Previously the backport has to be done manually by either a core developer or the original PR author.
With the bot, the backport PR is created automatically after the PR has been merged. A core developer will need to review the backport PR.
The issue was tracked in https://github.com/python/core-workflow/issues/8
How it works
If a PR needs to be backported to one of the maintenance branches, a core developer should apply the "needs backport to X.Y" label. Do this **before** you merge the PR.
Merge the PR
miss-islington will leave a comment on the PR, saying it is working on backporting the PR.
If there's no merge conflict, the PR should be created momentarily.
Review the backport PR created by miss-islington and merge it when you're ready.
Merge Conflicts / Problems?
In case of merge conflicts, or if a backport PR was not created within 2 minutes, it likely failed and you should do the backport manually.
Manual backport can be done using cherry_picker: https://pypi. org/project/cherry-picker/
Older merged PRs not yet backported?
At the moment, those need to be backported manually.
Don't want PR to be backported by a bot?
My recommendation is to apply the "needs backport to X.Y" **after** the PR has been merged. The label is still useful to remind ourselves that this PR still needs backporting.
Who is Miss Islington?
I found out from Wikipedia that Miss Islington is the name of the witch in Monty Python and The Holy Grail.
miss-islington has not signed the CLA!
A core dev can ignore the warning and merge the PR anyway.
Thanks!
Mariatta Wijaya
python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
-- "I disapprove of what you say, but I will defend to the death your right to say it." -- Evelyn Beatrice Hall (summarizing Voltaire) "The people's good is the highest law." -- Cicero GPG Key fingerprint: D1B3 ADC0 E023 8CA6
Congrats!
INADA Naoki <songofacandy@gmail.com>
On Wed, Sep 6, 2017 at 10:10 AM, Mariatta Wijaya <mariatta.wijaya@gmail.com> wrote:
Hi,
The cherry picker bot has just been deployed to CPython repo, codenamed miss-islington.
miss-islington made the very first backport PR for CPython and became a first time GitHub contributor: https://github.com/python/cpython/pull/3369
GitHub repo: https://github.com/python/miss-islington
What is this?
As part of our workflow, quite often changes made on the master branch need to be backported to the earlier versions. (for example: from master to 3.6 and 2.7)
Previously the backport has to be done manually by either a core developer or the original PR author.
With the bot, the backport PR is created automatically after the PR has been merged. A core developer will need to review the backport PR.
The issue was tracked in https://github.com/python/core-workflow/issues/8
How it works
If a PR needs to be backported to one of the maintenance branches, a core developer should apply the "needs backport to X.Y" label. Do this **before** you merge the PR.
Merge the PR
miss-islington will leave a comment on the PR, saying it is working on backporting the PR.
If there's no merge conflict, the PR should be created momentarily.
Review the backport PR created by miss-islington and merge it when you're ready.
Merge Conflicts / Problems?
In case of merge conflicts, or if a backport PR was not created within 2 minutes, it likely failed and you should do the backport manually.
Manual backport can be done using cherry_picker: https://pypi.org/project/cherry-picker/
Older merged PRs not yet backported?
At the moment, those need to be backported manually.
Don't want PR to be backported by a bot?
My recommendation is to apply the "needs backport to X.Y" **after** the PR has been merged. The label is still useful to remind ourselves that this PR still needs backporting.
Who is Miss Islington?
I found out from Wikipedia that Miss Islington is the name of the witch in Monty Python and The Holy Grail.
miss-islington has not signed the CLA!
A core dev can ignore the warning and merge the PR anyway.
Thanks!
Mariatta Wijaya
python-committers mailing list python-committers@python.org https://mail.python.org/mailman/listinfo/python-committers Code of Conduct: https://www.python.org/psf/codeofconduct/
Update:
Older merged PRs not yet backported?
A core developer can re-apply the needs backport .. label to trigger the
backport. Meaning, remove the existing label, then add it back. If there
was no label and now you want it to be backported, adding the label will
also trigger the backport.
Don't want PR to be backported by a bot?
Close the backport PR made by Miss Islington and make your own backport PR.
Thanks!
Mariatta Wijaya
On Tue, Sep 5, 2017 at 6:10 PM, Mariatta Wijaya <mariatta.wijaya@gmail.com> wrote:
Hi,
The cherry picker bot has just been deployed to CPython repo, codenamed miss-islington.
miss-islington made the very first backport PR for CPython and became a first time GitHub contributor: https://github.com/python/cpython/pull/3369
GitHub repo: https://github.com/python/miss-islington
What is this?
As part of our workflow, quite often changes made on the master branch need to be backported to the earlier versions. (for example: from master to 3.6 and 2.7)
Previously the backport has to be done manually by either a core developer or the original PR author.
With the bot, the backport PR is created automatically after the PR has been merged. A core developer will need to review the backport PR.
The issue was tracked in https://github.com/python/core-workflow/issues/8
How it works
If a PR needs to be backported to one of the maintenance branches, a core developer should apply the "needs backport to X.Y" label. Do this **before** you merge the PR.
Merge the PR
miss-islington will leave a comment on the PR, saying it is working on backporting the PR.
If there's no merge conflict, the PR should be created momentarily.
Review the backport PR created by miss-islington and merge it when you're ready.
Merge Conflicts / Problems?
In case of merge conflicts, or if a backport PR was not created within 2 minutes, it likely failed and you should do the backport manually.
Manual backport can be done using cherry_picker: https://pypi. org/project/cherry-picker/
Older merged PRs not yet backported?
At the moment, those need to be backported manually.
Don't want PR to be backported by a bot?
My recommendation is to apply the "needs backport to X.Y" **after** the PR has been merged. The label is still useful to remind ourselves that this PR still needs backporting.
Who is Miss Islington?
I found out from Wikipedia that Miss Islington is the name of the witch in Monty Python and The Holy Grail.
miss-islington has not signed the CLA!
A core dev can ignore the warning and merge the PR anyway.
Thanks!
Mariatta Wijaya
On Tue, Sep 5, 2017 at 6:10 PM, Mariatta Wijaya <mariatta.wijaya@gmail.com> wrote:
Hi,
The cherry picker bot has just been deployed to CPython repo, codenamed miss-islington.
miss-islington made the very first backport PR for CPython and became a first time GitHub contributor: https://github.com/python/cpython/pull/3369
Thanks Mariatta. This is an awesome contribution. It's going to extremely helpful.
-- Senthil
participants (4)
-
Alex Gaynor -
INADA Naoki -
Mariatta Wijaya -
Senthil Kumaran