[Python-checkins] peps: Clarifications from the PyCon US 2016 language summit

Thu Jun 9 14:45:40 EDT 2016

https://hg.python.org/peps/rev/b3b5c2ec657d
changeset: 6360:b3b5c2ec657d
user: Brett Cannon <brett at python.org>
date: Thu Jun 09 11:45:31 2016 -0700
summary:
 Clarifications from the PyCon US 2016 language summit
files:
 pep-0512.txt | 185 ++++++++++++++++++--------------------
 1 files changed, 87 insertions(+), 98 deletions(-)

diff --git a/pep-0512.txt b/pep-0512.txt
--- a/pep-0512.txt
+++ b/pep-0512.txt
@@ -162,8 +162,8 @@
 
 Since moving to GitHub also entails moving to Git [#git]_, we must
 decide what tools and commands we will run to translate a Mercurial
-repository to Git. The exact tools and steps to use are an
-open issue; see `Tools and commands to move from Mercurial to Git`_.
+repository to Git. The tools developed specifically for this migration
+are hosted at https://github.com/orsenthil/cpython-hg-to-git .
 
 
 CLA enforcement
@@ -287,42 +287,6 @@
 `Git CLI commands for committing a pull request to cpython`_.
 
 
-Handling Misc/NEWS
-''''''''''''''''''
-
-Traditionally the ``Misc/NEWS`` file [#news-file]_ has been problematic
-for changes which spanned Python releases. Often times there will be
-merge conflicts when committing a change between e.g., 3.5 and 3.6
-only in the ``Misc/NEWS`` file. It's so common, in fact, that the
-example instructions in the devguide explicitly mention how to
-resolve conflicts in the ``Misc/NEWS`` file
-[#devguide-merge-across-branches]_. As part of our tool
-modernization, working with the ``Misc/NEWS`` file will be
-simplified.
-
-There are currently two competing approaches to solving the
-``Misc/NEWS`` problem which are discussed in an open issue:
-`How to handle the Misc/NEWS file`_.
-
-
-Handling Misc/ACKS
-''''''''''''''''''
-
-Traditionally the ``Misc/ACKS`` file [#acks-file]_ has been managed
-by hand. But thanks to Git supporting an ``author`` value as well as
-a ``committer`` value per commit, authorship of a commit can be part
-of the history of the code itself.
-
-As such, manual management of ``Misc/ACKS`` will become optional. A
-script will be written that will collect all author and committer
-names and merge them into ``Misc/ACKS`` with all of the names listed
-prior to the move to Git. Running this script will become part of the
-release process.
-
-The script should also generate a list of all people who contributed
-since the last execution. This will allow having a list of those who
-contributed to a specific release so they can be explicitly thanked.
-
 Linking pull requests to issues
 '''''''''''''''''''''''''''''''
 Historically, external contributions were attached to an issue on
@@ -355,11 +319,11 @@
 referencing another issue was done, but these are rare occasions.
 
 
-Notify the issue if the pull request is committed
-+++++++++++++++++++++++++++++++++++++++++++++++++
+Notify the issue if a commit is made
+++++++++++++++++++++++++++++++++++++
 
-Once a pull request is closed (merged or not), the issue should be
-updated to reflect this fact.
+Once a commit is made, the corresponding issue should be updated to
+reflect this fact.
 
 
 Update linking service for mapping commit IDs to URLs
@@ -373,6 +337,81 @@
 revision IDs created for the Git repository.
 
 
+Deprecate sys._mercurial
+''''''''''''''''''''''''
+
+Once Python is no longer kept in Mercurial, the ``sys._mercurial``
+attribute will need to be changed to return ``('CPython', '', '')``.
+An equivalent ``sys._git`` attribute will be added which fulfills the
+same use-cases.
+
+
+Update the devguide
+'''''''''''''''''''
+
+The devguide will need to be updated with details of the new
+workflow. Mostly likely work will take place in a separate branch
+until the migration actually occurs.
+
+
+Update PEP 101
+''''''''''''''
+
+The release process will need to be updated as necessary.
+
+
+Optional, Planned Features
+--------------------------
+
+Once the cpython repository [#cpython-repo]_ is migrated, all
+repositories will have been moved to GitHub [#github]_ and the
+development process should be on equal footing as before. But a key
+reason for this migration is to improve the development process,
+making it better than it has ever been. This section outlines some
+plans on how to improve things.
+
+It should be mentioned that overall feature planning for
+bugs.python.org [#b.p.o]_ -- which includes plans independent of this
+migration -- are tracked on their own wiki page [#tracker-plans]_.
+
+
+Handling Misc/NEWS
+''''''''''''''''''
+
+Traditionally the ``Misc/NEWS`` file [#news-file]_ has been problematic
+for changes which spanned Python releases. Often times there will be
+merge conflicts when committing a change between e.g., 3.5 and 3.6
+only in the ``Misc/NEWS`` file. It's so common, in fact, that the
+example instructions in the devguide explicitly mention how to
+resolve conflicts in the ``Misc/NEWS`` file
+[#devguide-merge-across-branches]_. As part of our tool
+modernization, working with the ``Misc/NEWS`` file will be
+simplified.
+
+There are currently two competing approaches to solving the
+``Misc/NEWS`` problem which are discussed in an open issue:
+`How to handle the Misc/NEWS file`_.
+
+
+Handling Misc/ACKS
+''''''''''''''''''
+
+Traditionally the ``Misc/ACKS`` file [#acks-file]_ has been managed
+by hand. But thanks to Git supporting an ``author`` value as well as
+a ``committer`` value per commit, authorship of a commit can be part
+of the history of the code itself.
+
+As such, manual management of ``Misc/ACKS`` will become optional. A
+script will be written that will collect all author and committer
+names and merge them into ``Misc/ACKS`` with all of the names listed
+prior to the move to Git. Running this script will become part of the
+release process.
+
+The script should also generate a list of all people who contributed
+since the last execution. This will allow having a list of those who
+contributed to a specific release so they can be explicitly thanked.
+
+
 Create https://git.python.org
 '''''''''''''''''''''''''''''
 
@@ -398,44 +437,6 @@
 disappear overnight.
 
 
-Deprecate sys._mercurial
-''''''''''''''''''''''''
-
-Once Python is no longer kept in Mercurial, the ``sys._mercurial``
-attribute will need to be changed to return ``('CPython', '', '')``.
-An equivalent ``sys._git`` attribute will be added which fulfills the
-same use-cases.
-
-
-Update the devguide
-'''''''''''''''''''
-
-The devguide will need to be updated with details of the new
-workflow. Mostly likely work will take place in a separate branch
-until the migration actually occurs.
-
-
-Update PEP 101
-''''''''''''''
-
-The release process will need to be updated as necessary.
-
-
-Optional, Planned Features
---------------------------
-
-Once the cpython repository [#cpython-repo]_ is migrated, all
-repositories will have been moved to GitHub [#github]_ and the
-development process should be on equal footing as before. But a key
-reason for this migration is to improve the development process,
-making it better than it has ever been. This section outlines some
-plans on how to improve things.
-
-It should be mentioned that overall feature planning for
-bugs.python.org [#b.p.o]_ -- which includes plans independent of this
-migration -- are tracked on their own wiki page [#tracker-plans]_.
-
-
 Bot to handle pull request merging
 ''''''''''''''''''''''''''''''''''
 
@@ -613,12 +614,11 @@
 
 * Not started
 
- - peps [#peps-repo]_
 - devguide [#devguide-repo]_
 
 * In progress
 
- - None
+ - peps [#peps-repo]_
 
 * Completed
 
@@ -629,13 +629,9 @@
 * Not started
 
 - `Document steps to commit a pull request`_
- - `Handling Misc/NEWS`_
- - `Handling Misc/ACKS`_
 - `Linking a pull request to an issue`_
- - `Notify the issue if the pull request is committed`_
+ - `Notify the issue if a commit is made`_
 - `Update linking service for mapping commit IDs to URLs`_
- - `Create https://git.python.org`_
- - `Backup of pull request data`_
 - `Deprecate sys._mercurial`_
 - `Update the devguide`_
 - `Update PEP 101`_
@@ -652,6 +648,10 @@
 
 * Not started
 
+ - `Create https://git.python.org`_
+ - `Backup of pull request data`_
+ - `Handling Misc/NEWS`_
+ - `Handling Misc/ACKS`_
 - `Bot to handle pull request merging`_
 - `Continuous integration per pull request`_
 - `Test coverage report`_
@@ -699,17 +699,6 @@
 hg.python.org.
 
 
-Tools and commands to move from Mercurial to Git
-------------------------------------------------
-
-A decision needs to be made on exactly what tooling and what commands
-involving those tools will be used to convert a Mercurial repository
-to Git. Currently a suggestion has been made to use
-https://github.com/frej/fast-export. Another suggestion is to use
-https://github.com/felipec/git-remote-hg. Finally,
-http://hg-git.github.io/ has been suggested.
-
-
 Git CLI commands for committing a pull request to cpython
 ---------------------------------------------------------
 
-- 
Repository URL: https://hg.python.org/peps
