<div dir="ltr">I was purposefully trying to avoid having this discussion start until Monday, but since Ezio sort has a deadline for issue-related stuff we can start on that side now (I still have an email planned on Monday to outline the initial steps to moving things over and the very first hurdle to work through).<div><br><div class="gmail_quote"><div dir="ltr">On Fri, 1 Jan 2016 at 17:57 Ezio Melotti <<a href="mailto:ezio.melotti@gmail.com">ezio.melotti@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi,<br>
<br>
On Fri, Jan 1, 2016 at 9:21 PM, Brett Cannon <<a href="mailto:brett@python.org" target="_blank">brett@python.org</a>> wrote:<br>
> I don't think this will be a shock to anyone who has followed the discussion<br>
> on this list. The decision is essentially based on:<br>
><br>
> No major distinguishing features between GitHub or GitLab<br>
> Familiarity amongst core devs -- and external contributors -- with GitHub<br>
> Guido prefers GitHub<br>
><br>
> Neither platform had some mind-blowing feature(s) that really made them<br>
> stand out from each other such that it would greatly simplify our lives if<br>
> we chose one platform over another. I obviously was really hoping there was<br>
> going to be something I missed, but nothing ever came up (and no, being open<br>
> source is not enough of a feature; as I said when I started this process,<br>
> being open source would help break ties or minor lead of one tool but not be<br>
> a deciding factor).<br>
><br>
> But what Github does have over GitLab is familiarity. While there were<br>
> people who publicly said they would prefer not to go with GitHub but would<br>
> begrudgingly use it if we chose to go that route, I had multiple core devs<br>
> email me privately saying they hoped I would choose GitHub. I think most of<br>
> that stemmed from having used GitHub for other open source projects and/or<br>
> work, making even dormant core devs say they would be able to become active<br>
> again if we switched to GitHub thanks to eliminating the barrier of having<br>
> to keep up with our custom workflow for code reviews and using hg for<br>
> commits. And while I said it wasn't a goal to make things easier for<br>
> external contributors, I also can't ignore the fact that the vast majority<br>
> of people out there who might want to help out are already familiar with<br>
> GitHub.<br>
><br>
> And at least for me, the fact Guido prefers GitHub means something. While<br>
> Guido himself would say I shouldn't really worry about his preferences since<br>
> he is only an occasional contributor at this point, I believe that it's<br>
> important that our BDFL actually like contributing to his own programming<br>
> language rather than potentially alienating him because he finds the process<br>
> burdensome.<br>
><br>
> So that's why I have chosen GitHub over GitLab. Please realize that this is<br>
> choosing GitHub to provide repository hosting and code review; we are not<br>
> moving our issue tracker, nor are we moving our wiki. And the long-term plan<br>
> is to set up a bot that will handle our commit workflow which will help<br>
> isolate us from any repository hosting platform we are on and making moving<br>
> easier in the future (and short-term people will use the command-line and<br>
> that's totally platform-agnostic).<br>
><br>
> Thanks to everyone who contributed to this decision, especially Donald,<br>
> Barry, and Nick for making the proposals we had to work from.<br>
><br>
> We can start the discussion of how we want to handle the transition next<br>
> week, but I'm going to try and step away from this whole workflow topic<br>
> until Monday so I can spend the last couple of days of my vacation not<br>
> thinking about this stuff. :)<br>
><br>
<br>
This will likely require a new PEP, that should cover:<br>
1) the new workflow (including how to handle reviews -- see below);<br>
2) the steps required for the migration and a timeline;<br>
3) a list of things that will break and/or that will need to be<br>
added/replaced before/during/after the migration;<br>
4) the fate of <a href="http://hg.python.org" rel="noreferrer" target="_blank">hg.python.org</a>;<br></blockquote><div><br></div><div>Yes to all of that.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Some of these things might already be covered by existing PEPs, but I<br>
don't see them in PEP 507[0] and 481[1] (and I'm getting a bit lost<br>
among all the competing PEPs and multiple threads across at least a<br>
couple different MLs :).<br></blockquote><div><br></div><div>It will be either be a new PEP or the GitHub PEP will simply be rewritten.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Above you said that GitHub will be used for reviews but we will keep<br>
using our bug tracker.<br></blockquote><div><br></div><div>Yes, we are not moving to GitHub's issue tracker.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
This leads to the following questions:<br>
* Do GitHub reviews only work for pull requests?<br></blockquote><div><br></div><div>What do you mean by this? Do you mean by patch upload?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
* Are we still going to support uploading diffs/patches to the<br>
tracker (short term and long term)?<br></blockquote><div><br></div><div>Well, "support" as in "allow". We won't be keeping Rietveld around (part of this move is so we can get off of Rietveld).</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
* If so, how/where are we going to review those diffs/patches?<br></blockquote><div><br></div><div>I don't know. Is it possible to have the bot create a PR for an uploaded patch?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
* Will patches be automatically converted to pull requests, or pull<br>
requests converted to patches and attached to b.p.o issues?<br></blockquote><div><br></div><div>I don't think we need to upload a patch file if we already have a PR, but we should either have a PR -> issue or issue -> PR mapping somehow. This can either be via bot command or specifying a PR # in the issue tracker. I also have no issue if people want to make PRs generate patches for the issue as well for backup purposes, but that might get a bit noisy for those following both an issue and a PR.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
* Are there plans to migrate existing Rietveld reviews to GitHub and<br>
shut Rietveld down for good?<br></blockquote><div><br></div><div>Yes, there are plans to shut Rietveld down. I suspect we will leave it up until GitHub is running in an equivalent fashion to our current workflow, then we will have a deadline to work through any outstanding reviews and then close it up (and if we want to be thorough, set Rietveld so that it won't work on new issues and only pre-existing ones that already have a patch).</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
* If not, will Rietveld stay around and be read-only? Or will it<br>
still be used for patches uploaded to b.p.o?<br></blockquote><div><br></div><div>We are trying to cut down on the infrastructure we maintain, so I don't want Rietveld sticking around indefinitely.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
* What else is needed to integrate GitHub and b.p.o?<br></blockquote><div><br></div><div>Basically a way to map an issue to a PR (or vice-versa). Probably the simplest solution is to allow pasting in a GitHub PR URL or the PR # to make the association. The other option is for the bot to accept a command to make the association. No reason we can't have both, though. But either way we should have a way to connect PRs to issues.</div><div><br></div><div>If a bot can create PRs from a patch, then that would be nice for folks who don't want to use GitHub, but I don't consider that a priority. I'm happy to try to be accommodating to people who don't want to use GitHub for whatever reason, there is a limit to how much energy we should put into supporting that scenario past uploading a patch.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
About points 3 of the initial list, these are some examples of things<br>
that will need to be added/updated/replaced:<br>
* the hgroundup hook[2] that post messages to b.p.o when a commit<br>
includes an issue number needs to be replaced;<br>
* the hgirker hook[3] used for deadparrot on #python-dev needs to be<br>
replaced (probably there is already an irker-git hook that can be<br>
used/adapted);<br>
* the hgbuildbot[4] hook that triggers the buildbots on commit needs<br>
to be replaced;<br>
* other hg hooks[5] might need to be rewritten/replaced;<br>
* the script[6] that generates bug tracker links to hg.p.o needs to<br>
be updated (for both cs ids and paths);<br>
* the hg code that converts issue links in commit messages to b.p.o<br>
links needs to be replaced;<br>
* other places where issue numbers appears on GitHub should generate<br>
links to b.p.o;<br>
* the hg-cpydev hg extension [7] should be ported to git (optional);<br>
* the buildbots need to be updated if they are going to pull the<br>
source from github and use git;<br>
* the bug tracker will need to be updated to interact with github;<br>
* the devguide needs to be updated (both to cover the new workflow<br>
and update links/commands);<br></blockquote><div><br></div><div>Yes to all of these (I think; depends if we change how something operates in terms of associations).</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
FWIW next weekend (9-10 January) we are organizing a sprint in<br>
Helsinki, and I'm planning to work on the bug tracker, so I might be<br>
able to start addressing some of these points.<br></blockquote><div><br></div><div>I think deciding how to associate issues with PRs would be a great thing to work through. Otherwise we need to decide if we want to go with an issue tracker solution to the NEWS file or if we want a individual file solution (which happens to be bot-friendly). Those two things are probably the most critical starting points.</div><div><br></div><div>-Brett</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Best Regards,<br>
Ezio Melotti<br>
<br>
P.S. enjoy your last few days of vacation while you can ;)<br>
<br>
[0]: <a href="https://www.python.org/dev/peps/pep-0507/" rel="noreferrer" target="_blank">https://www.python.org/dev/peps/pep-0507/</a><br>
[1]: <a href="https://www.python.org/dev/peps/pep-0481/" rel="noreferrer" target="_blank">https://www.python.org/dev/peps/pep-0481/</a><br>
[2]: <a href="https://hg.python.org/hooks/file/tip/hgroundup.py" rel="noreferrer" target="_blank">https://hg.python.org/hooks/file/tip/hgroundup.py</a><br>
[3]: <a href="https://hg.python.org/hooks/file/tip/hgirker.py" rel="noreferrer" target="_blank">https://hg.python.org/hooks/file/tip/hgirker.py</a><br>
[4]: <a href="https://hg.python.org/hooks/file/tip/hgbuildbot.py" rel="noreferrer" target="_blank">https://hg.python.org/hooks/file/tip/hgbuildbot.py</a><br>
[5]: <a href="https://hg.python.org/hooks/file/tip" rel="noreferrer" target="_blank">https://hg.python.org/hooks/file/tip</a><br>
[6]: <a href="https://hg.python.org/tracker/python-dev/file/tip/extensions/local_replace.py" rel="noreferrer" target="_blank">https://hg.python.org/tracker/python-dev/file/tip/extensions/local_replace.py</a><br>
[7]: <a href="https://bitbucket.org/introom/hg-cpydev" rel="noreferrer" target="_blank">https://bitbucket.org/introom/hg-cpydev</a><br>
</blockquote></div></div></div>