Updates from discussions

pep-0512.txt

@@ -8,7 +8,7 @@ Status: Active
 Type: Process
 Content-Type: text/x-rst
 Created: 17-Jan-2015
-Post-History: 17-Jan-2015, 19-Jan-2015
+Post-History: 17-Jan-2016, 19-Jan-2016, 23-Jan-2016
 
 Abstract
 ========
@@ -197,6 +197,12 @@ bot happens to fail, preventing potential false-positives or
 false-negatives. It also allows for an easy way to trigger the bot
 again by simply removing a CLA-related label.
 
+If no pre-existing, maintained bot exists that fits our needs, one
+will be written from scratch. It will be hosted on Heroku [#heroku]_
+and written to target Python 3.5 to act as a showcase for
+asynchronous programming. The bot's actual name is an open issue:
+`Naming the bots`_
+
 Requirements for Web-Related Repositories
 -----------------------------------------
 Due to their use for generating webpages, the
@@ -341,11 +347,12 @@ issues with GitHub. It also helps guarantee that a migration from
 GitHub to some other code review system is feasible were GitHub to
 disappear overnight.
 
-Change sys._mercurial
+Deprecate sys._mercurial
-'''''''''''''''''''''
+''''''''''''''''''''''''
 Once Python is no longer kept in Mercurial, the ``sys._mercurial``
-attribute will need to be removed. An equivalent ``sys._git``
+attribute will need to be changed to return ``('CPython', '', '')``.
-attribute will be needed to take its place.
+An equivalent ``sys._git`` attribute will be added which fulfills the
+same use-cases.
 
 Update the devguide
 '''''''''''''''''''
@@ -389,13 +396,16 @@ commits did not interfere with each other by running the test suite
 and backing out commits if the test run failed. To help facilitate
 the speed of testing, all patches committed since the last test run
 can be applied and run in a single test run as the optimistic
-assumption is that the patches will work in tandem.
+assumption is that the patches will work in tandem. Some mechanism to
+re-run the tests in case of test flakiness will be needed, whether it
+is from removing a "test failed" label, web interface for core
+developers to trigger another testing event, etc.
 
 Inspiration or basis of the bot could be taken from pre-existig bots
 such as Homu [#homu]_ or Zuul [#zuul]_.
 
 The name given to this bot in order to give it commands is an open
-issue: `Naming the commit bot`_.
+issue: `Naming the bots`_.
 
 Continuous integration per pull request
 '''''''''''''''''''''''''''''''''''''''
@@ -500,12 +510,11 @@ benchmarks [#benchmarks-repo]_ repositories:
   - `Create a 'python-dev' team`_
   - `Define commands to move a Mercurial repository to Git`_
   - `Adding GitHub username support to bugs.python.org`_
-  - `A bot to enforce CLA signing`_
 
 * In progress
 
-  - None
+    - `A bot to enforce CLA signing`_:
-
+      https://github.com/brettcannon/knights-who-say-ni (Brett Cannon)
 * Completed
 
   - None
@@ -537,7 +546,7 @@ Requirements to move over the cpython repo [#cpython-repo]_:
   - `Update linking service for mapping commit IDs to URLs`_
   - `Create https://git.python.org`_
   - `Backup of pull request data`_
-  - `Change sys._mercurial`_
+  - `Deprecate sys._mercurial`_
   - `Update the devguide`_
   - `Update PEP 101`_
 
@@ -666,17 +675,17 @@ approach allows for keeping the NEWS file as a single file. It does
 run the risk, though, of failure and thus blocking a commit until it
 can be manually resolved.
 
-Naming the commit bot
+Naming the bots
----------------------
+---------------
 As naming things can lead to bikeshedding of epic proportions, Brett
-Cannon will choose the final name of the commit bot (the name of the
+Cannon will choose the final name of the various bots (the name of
-project for the bot itself can be anything, this is purely for the
+the project for the bots themselves can be anything, this is purely
-name used in giving commands to the bot). The name will come from
+for the name used in giving commands to the bot or the account name).
-Monty Python, which is only fitting since Python is named after the
+The names will come from Monty Python, which is only fitting since
-comedy troupe. It will most likely come from
+Python is named after the comedy troupe. They will most likely come
-'Monty Python and the Holy Grail' [#holy-grail]_ (which happens to be
+from 'Monty Python and the Holy Grail' [#holy-grail]_ (which happens
-how Brett was introduced to Monty Python). Current ideas on the name
+to be how Brett was introduced to Monty Python). Current ideas on the
-include:
+name include:
 
 "Black Knight" sketch [#black-knight-sketch]_:
 
@@ -701,11 +710,6 @@ include:
 * holy-hand-grenade
 * 5-is-right-out
 
-"Witch Village" sketch [#witch-village-sketch]_:
-
-* made-of-wood
-* burn-her
-
 "French Taunter" sketch [#french-taunter-sketch]_:
 
 * elderberries
@@ -716,10 +720,11 @@ include:
 * dennis
 * from-the-masses
 
-"Knights Who Say Ni" sketch [#ni-sketch]_:
+"Knights Who Say 'Ni'" sketch [#ni-sketch]_:
 
 * shubbery
 * ni
+* knights-who-say-ni
 
 From "Monty Python and the Holy Grail" in general:
 
@@ -863,9 +868,6 @@ References
 .. [#killer-rabbit-sketch] "Killer rabbit" sketch from "Monty Python and the Holy Grail"
    (https://www.youtube.com/watch?v=Nvs5pqf-DMA&list=PL-Qryc-SVnnu1MvN3r94Y9atpaRuIoGmp&index=11)
 
-.. [#witch-village-sketch] "Witch Village" from "Monty Python and the Holy Grail"
-   (https://www.youtube.com/watch?v=k3jt5ibfRzw&list=PL-Qryc-SVnnu1MvN3r94Y9atpaRuIoGmp&index=12)
-
 .. [#french-taunter-sketch] "French Taunter" from "Monty Python and the Holy Grail"
    (https://www.youtube.com/watch?v=A8yjNbcKkNY&list=PL-Qryc-SVnnu1MvN3r94Y9atpaRuIoGmp&index=13)
 
@@ -891,6 +893,8 @@ References
 
 .. [#pypatcher] Pypatcher (https://github.com/kushaldas/pypatcher)
 
+.. [#heroku] Heroku (https://www.heroku.com/)
+
 Copyright
 =========