8000 Merge branch 'master' of github.com:python/peps · python/peps@b409f87 · GitHub
[go: up one dir, main page]

Skip to content

Commit b409f87

Browse files
committed
Merge branch 'master' of github.com:python/peps
2 parents e0acccf + e8d5bd2 commit b409f87

14 files changed

+1522
-835
lines changed

.travis.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
language: python
2+
python:
3+
- 3.5
4+
5+
sudo: false
6+
cache: pip
7+
8+
before_install:
9+
- pip install docutils
10+
script:
11+
- make

pep-0001.txt

Lines changed: 11 additions & 11 deletions
< 8000 td data-grid-cell-id="diff-357b9fa6af825713b993fac3d7aa06bde4c02902d87d352239d2ded11767205a-158-158-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">158
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,18 @@ not in keeping with the Python philosophy. The BDFL can be consulted
152152
during the approval phase, and is the final arbiter of the draft's
153153
PEP-ability.
154154

155-
Developers with hg push privileges for the `PEP repository`_ may claim
155+
Developers with git push privileges for the `PEP repository`_ may claim
156156
PEP numbers directly by creating and committing a new PEP. When doing so,
157157
the developer must handle the tasks that would normally be taken care of by
158
the PEP editors (see `PEP Editor Responsibilities & Workflow`_). This
159159
includes ensuring the initial version meets the expected standards for
160160
submitting a PEP. Alternately, even developers may choose to submit PEPs
161161
through the PEP editors. When doing so, let the PEP editors know you have
162-
hg push privileges and they can guide you through the process of updating
162+
git push privileges and they can guide you through the process of updating
163163
the PEP repository directly.
164164

165165
As updates are necessary, the PEP author can check in new versions if they
166-
(or a collaborating developer) have hg push privileges, or else they can
166+
(or a collaborating developer) have git push privileges, or else they can
167167
email new PEP versions to the PEP editors for publication.
168168

169169
After a PEP number has been assigned, a draft PEP may be discussed further on
@@ -471,8 +471,8 @@ bug/patch to them, otherwise assign it to a PEP editor.
471471
When in doubt about where to send your changes, please check first
472472
with the PEP author and/or a PEP editor.
473473

474-
PEP authors with hg push privileges for the PEP repository can update the
475-
PEPs themselves by using "hg push" to submit their changes.
474+
PEP authors with git push privileges for the PEP repository can update the
475+
PEPs themselves by using "git push" to submit their changes.
476476

477477

478478
Transferring PEP Ownership
@@ -528,12 +528,12 @@ Once the PEP is ready for the repository, a PEP editor will:
528528
Python 3 only, the process is back to using numbers in the 100s again.
529529
Remember that numbers below 100 are meta-PEPs.)
530530

531-
* Add the PEP to a local clone of the PEP repository. For mercurial workflow
531+
* Add the PEP to a local clone of the PEP repository. For workflow
532532
instructions, follow `The Python Developers Guide <http://docs.python.org/devguide>`_
533533

534-
The mercurial repo for the peps is::
534+
The git repo for the peps is::
535535

536-
http://hg.python.org/peps/
536+
https://github.com/python/peps
537537

538538
* Run ``./genpepindex.py`` and ``./pep2html.py <PEP Number>`` to ensure they
539539
are generated without errors. If either triggers errors, then the web site
@@ -575,9 +575,9 @@ Resources:
575575
References and Footnotes
576576
========================
577577

578-
.. [1] This historical record is available by the normal hg commands
578+
.. [1] This historical record is available by the normal git commands
579579
for retrieving older revisions, and can also be browsed via HTTP here:
580-
http://hg.python.org/peps/
580+
https://github.com/python/peps
581581

582582
.. [2] PEP 2, Procedure for Adding New Modules, Faassen
583583
(http://www.python.org/dev/peps/pep-0002)
@@ -603,7 +603,7 @@ References and Footnotes
603603

604604
.. _Docutils: http://docutils.sourceforge.net/
605605

606-
.. _PEP repository: http://hg.python.org/peps
606+
.. _PEP repository: https://github.com/python/peps
607607

608608

609609
Copyright

0 commit comments

Comments
 (0)
0