Re: [python-committers] Travis requirement temporarily turned off

2017-03-06 Thread Brett Cannon
I have turned back on the requirement that Travis be passing for PRs since
3.6.1rc1 is out and we now already have one instance where a merge broke
the build (https://github.com/python/cpython/pull/518; it's been fixed). We
will revisit this topic when I email on Friday about the workflow.

On Thu, 2 Mar 2017 at 20:15 Brett Cannon  wrote:

> Travis is severely backed up at the moment. Knowing that 3.6.1rc1 is due
> this weekend I have temporarily turned off Travis requiring to be passing
> so that those who test locally can skip being blocked by hour-long (or
> more) wait times for Travis. If you don't want to test I would then still
> strongly recommend on waiting for Travis if you don't feel like your PR is
> critical to 3.6.
>
___
python-committers mailing list
[email protected]
https://mail.python.org/mailman/listinfo/python-committers
Code of Conduct: https://www.python.org/psf/codeofconduct/

[python-committers] GitHub: allow Rebase and merge

2017-03-06 Thread Victor Stinner
Hi,

Would it be possible to keep "Squash and merge" button by default on
GitHub pull requests, but allow "Rebase and merge" to keep multiple
commits when they are well written. Example of such PR:
https://github.com/python/cpython/pull/489/commits

Maybe the second commit lacks bpo-xxx, but it's not a big deal. I
prefer smaller atomic commits when possible.

Victor
___
python-committers mailing list
[email protected]
https://mail.python.org/mailman/listinfo/python-committers
Code of Conduct: https://www.python.org/psf/codeofconduct/