Re: [python-committers] Automerge bot deployed

2018-09-13 Thread Donald Stufft
Maybe the merge bot should render the description and then extract plaintext out of that?On Sep 13, 2018, at 2:16 PM, Victor Stinner  wrote:Ah yes, it works and I agree that it's OK in plain text. But we have careful if a contributor uses "\_" or something like that in a description. Maybe always edit to see the "source" of the description?VictorLe jeu. 13 sept. 2018 à 16:54, Petr Viktorin  a écrit :On Wed, Sep 12, 2018, 23:30 Victor Stinner  wrote:Today I created a PR with a description containing "type.__format__()". To display it properly, I chose to edit the description and write "type.\_\_format\_\_()". I guess that the bot will merge a description like that unchanged, right? So we should also be careful of description using Markdown syntax.Use `type.__format__`, with backticks, for code. That looks OK in plain text.Or edit before merging :)VictorLe mer. 12 sept. 2018 à 18:52, Mariatta Wijaya  a écrit :Update to the automerge bot:It will not merge unless there is "CLA signed" label, and no "DO-NOT-MERGE" label.Again, please edit the PR title and description before adding the `烙 automerge` label.The PR title and description will be used as the squashed commit message.Mariattaᐧᐧ
___
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/

___
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/


___python-committers mailing listpython-committers@python.orghttps://mail.python.org/mailman/listinfo/python-committersCode of Conduct: https://www.python.org/psf/codeofconduct/___
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/


Re: [python-committers] Automerge bot deployed

2018-09-13 Thread Victor Stinner
Ah yes, it works and I agree that it's OK in plain text. But we have
careful if a contributor uses "\_" or something like that in a description.
Maybe always edit to see the "source" of the description?

Victor

Le jeu. 13 sept. 2018 à 16:54, Petr Viktorin  a écrit :

>
>
> On Wed, Sep 12, 2018, 23:30 Victor Stinner  wrote:
>
>> Today I created a PR with a description containing "type.__format__()".
>> To display it properly, I chose to edit the description and write
>> "type.\_\_format\_\_()". I guess that the bot will merge a description like
>> that unchanged, right? So we should also be careful of description using
>> Markdown syntax.
>>
>
> Use `type.__format__`, with backticks, for code. That looks OK in plain
> text.
> Or edit before merging :)
>
>
>> Victor
>>
>> Le mer. 12 sept. 2018 à 18:52, Mariatta Wijaya 
>> a écrit :
>>
>>> Update to the automerge bot:
>>>
>>> It will not merge unless there is "CLA signed" label, and no
>>> "DO-NOT-MERGE" label.
>>>
>>> Again, please edit the PR title and description before adding the `烙
>>> automerge` label.
>>> The PR title and description will be used as the squashed commit message.
>>>
>>> Mariattaᐧ
>>> ᐧ
>>> ___
>>> 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/
>>>
>> ___
>> 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/
>>
>
___
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/


Re: [python-committers] Automerge bot deployed

2018-09-12 Thread Mariatta Wijaya
Update to the automerge bot:

It will not merge unless there is "CLA signed" label, and no "DO-NOT-MERGE"
label.

Again, please edit the PR title and description before adding the `烙
automerge` label.
The PR title and description will be used as the squashed commit message.

Mariattaᐧ
ᐧ
___
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/


Re: [python-committers] Automerge bot deployed

2018-09-11 Thread Guido van Rossum
W00t! 不

On Tue, Sep 11, 2018 at 1:48 PM Mariatta Wijaya 
wrote:

> I've deployed the bot to automerge CPython pull request on the master
> branch.
>
> One benefit of this is you don't need to worry about replacing "#" into
> "GH-".
>
> To get the bot to automerge:
> - first edit the PR title and description, to be the commit message you
> want to use.
> - approve the PR (so it will have "awaiting merge" label)
> - apply the "烙 automerge" label.
>
> It will wait for ALL status checks to pass, and merge the PR, replacing
> `#` with `GH-`
>
> I've made a demo video on YouTube: https://youtu.be/p85YtKKLNno
>
> See also previous discussions in
> https://github.com/python/core-workflow/issues/29
> https://github.com/python/bedevere/issues/14
>
> The previous way of merging PR still works. If you prefer merging the PR
> yourself,  just don't apply the "烙 automerge" label.
>
> Mariatta
> ᐧ
> ___
> 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/
>
-- 
--Guido (mobile)
___
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/


[python-committers] Automerge bot deployed

2018-09-11 Thread Mariatta Wijaya
I've deployed the bot to automerge CPython pull request on the master
branch.

One benefit of this is you don't need to worry about replacing "#" into
"GH-".

To get the bot to automerge:
- first edit the PR title and description, to be the commit message you
want to use.
- approve the PR (so it will have "awaiting merge" label)
- apply the "烙 automerge" label.

It will wait for ALL status checks to pass, and merge the PR, replacing `#`
with `GH-`

I've made a demo video on YouTube: https://youtu.be/p85YtKKLNno

See also previous discussions in
https://github.com/python/core-workflow/issues/29
https://github.com/python/bedevere/issues/14

The previous way of merging PR still works. If you prefer merging the PR
yourself,  just don't apply the "烙 automerge" label.

Mariatta
ᐧ
___
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/