From f2035403d58d9e3de4e7f16f2fa722df5ec05794 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Mon, 26 Sep 2016 11:36:30 -0700 Subject: [PATCH 1/6] Add INADA Naoki as a developer --- developers.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/developers.rst b/developers.rst index fd688d7c73..eff8ee02e4 100644 --- a/developers.rst +++ b/developers.rst @@ -25,6 +25,9 @@ transliteration too. Permissions History ------------------- +- INADA Naoki was given push privileges on September 26, 2016 by Brett Cannon, + on the recommendation of Yury Selivanov. + - Xavier de Gaye was given push privileges on June 3, 2016 by Brett Cannon, on the recommendation of Victor Stinner. From f99cca8c90bc41988ac89d446d98c662a9730c0d Mon Sep 17 00:00:00 2001 From: Berker Peksag Date: Sat, 1 Oct 2016 02:50:08 +0300 Subject: [PATCH 2/6] Remove redundant information from the "Build Python" step --- index.rst | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/index.rst b/index.rst index b384d67c24..2f79f94efb 100644 --- a/index.rst +++ b/index.rst @@ -31,16 +31,10 @@ patch: There are different instructions for :ref:`UNIX `, :ref:`Mac OS `, and :ref:`Windows `. - The command to compile on UNIX is:: + The command to compile on UNIX and Mac OS is:: - ./configure - make -j2 - - On some Mac OS:: - - CPPFLAGS="-I$(brew --prefix openssl)/include" \ - LDFLAGS="-L$(brew --prefix openssl)/lib" \ ./configure --with-pydebug + make -j On Windows:: From 16cc80d3cafde32ae219a9be3d836bf4ea25555e Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 6 Oct 2016 10:12:28 -0700 Subject: [PATCH 3/6] Reference the performance repo instead of the benchmarks repo (#43) --- runtests.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtests.rst b/runtests.rst index 4482efb083..96eeb4692f 100644 --- a/runtests.rst +++ b/runtests.rst @@ -130,7 +130,7 @@ Benchmarks ---------- Benchmarking is useful to test that a change does not degrade performance. -`The Grand Unified Python Benchmark Suite `_ +`The Python Benchmark Suite `_ has a collection of benchmarks for all Python implementations. Documentation about running the benchmarks is in the `README.txt -`_ of the benchmarks repo. +`_ of the repo. From 56a5872fc5c557954605b1eb7bbfc69f948b3965 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Fri, 21 Oct 2016 18:13:48 +0200 Subject: [PATCH 4/6] use Git/git instead of Mercurial/hg --- communication.rst | 2 +- devcycle.rst | 10 +++++----- documenting.rst | 2 +- grammar.rst | 2 +- index.rst | 10 +++++----- setup.rst | 48 +++++++++++++++++++---------------------------- 6 files changed, 32 insertions(+), 42 deletions(-) diff --git a/communication.rst b/communication.rst index f331cd2fb8..6aa755d000 100644 --- a/communication.rst +++ b/communication.rst @@ -31,7 +31,7 @@ Python. If a new idea does not start here (or python-list_, discussed below), it will get redirected here. Python-checkins_ sends out an email for every commit to Python's various -repositories from https://hg.python.org. All core developers +repositories from https://github.com/python/cpython. All core developers subscribe to this list and are known to reply to these emails to make comments about various issues they catch in the commit. Replies get redirected to python-dev. diff --git a/devcycle.rst b/devcycle.rst index 5e618087b4..cafa04f499 100644 --- a/devcycle.rst +++ b/devcycle.rst @@ -40,7 +40,7 @@ descendant of the ``3.5`` branch. Therefore, each change should be made **first** in the oldest branch to which it applies and forward-ported as appropriate: if a bug must be fixed in both Python -3.6 and 3.7, first fix it in ``3.6`` and then merge ``3.6`` into ``default`` +3.6 and 3.7, first fix it in ``3.6`` and then merge ``3.6`` into ``master`` (which holds the future 3.7). @@ -49,10 +49,10 @@ applies and forward-ported as appropriate: if a bug must be fixed in both Python In-development (main) branch ---------------------------- -The ``default`` branch is the branch for the next feature release; it is +The ``master`` branch is the branch for the next feature release; it is under active development for all kinds of changes: new features, semantic changes, performance improvements, bug fixes. As the name indicates, it -is the branch :ref:`checked out ` by default by Mercurial. +is the branch :ref:`checked out ` by default by Git. At some point during the life-cycle of a release, a new :ref:`maintenance branch ` is created to host all bug fixing @@ -117,9 +117,9 @@ security patches have been applied to the branch. Summary ------- -There are 7 open branches right now in the Mercurial repository: +There are 7 open branches right now in the Git repository: -- the ``default`` branch holds the future 3.7 version and descends from ``3.6`` +- the ``master`` branch holds the future 3.7 version and descends from ``3.6`` (RM: Ned Deily) - the ``3.6`` branch holds bug fixes for 3.6.0 and future 3.6.x maintenance releases and descends from ``3.5`` (RM: Ned Deily) diff --git a/documenting.rst b/documenting.rst index a59af88240..857790828c 100644 --- a/documenting.rst +++ b/documenting.rst @@ -15,7 +15,7 @@ documentation and how it should be used. The documentation in HTML, PDF or EPUB format is generated from text files written using the :ref:`reStructuredText format ` and contained in the -:ref:`CPython Mercurial repository `. +:ref:`CPython Git repository `. .. _reStructuredText: http://docutils.sf.net/rst.html diff --git a/grammar.rst b/grammar.rst index 0dec6302df..328bda665e 100644 --- a/grammar.rst +++ b/grammar.rst @@ -64,6 +64,6 @@ Checklist * After everything has been checked in, you're likely to see a new change to Python/Python-ast.c. This is because this - (generated) file contains the hg version of the source from + (generated) file contains the git version of the source from which it was generated. There's no way to avoid this; you just have to submit this file separately. diff --git a/index.rst b/index.rst index 2f79f94efb..b60808a5e6 100644 --- a/index.rst +++ b/index.rst @@ -16,14 +16,14 @@ patch: 1. Set up and install dependencies. - Install :ref:`Mercurial ` and other dependencies. + Install :ref:`Git ` and other dependencies. The dependencies needed will depend on the platform you're on. Go to :ref:`Get Setup ` page for detailed information. 2. :ref:`Get the source code `:: - hg clone https://hg.python.org/cpython + git clone https://github.com/python/cpython 3. Build Python. @@ -221,8 +221,8 @@ Key Resources * `Firefox search engine plug-in`_ * `Buildbot status`_ * Source code - * `Browse online `_ - * `Snapshot of py3k `_ + * `Browse online `_ + * `Snapshot of py3k `_ * `Daily OS X installer `_ * PEPs_ (Python Enhancement Proposals) * :doc:`faq` @@ -291,7 +291,7 @@ Full Table of Contents .. _Buildbot status: https://www.python.org/dev/buildbot/ .. _Firefox search engine plug-in: https://www.python.org/dev/searchplugin/ -.. _Misc directory: https://hg.python.org/cpython/file/default/Misc +.. _Misc directory: https://github.com/python/cpython/tree/master/Misc .. _PEPs: https://www.python.org/dev/peps/ .. _python.org maintenance: https://pythondotorg.readthedocs.io/ .. _Python: https://www.python.org/ diff --git a/setup.rst b/setup.rst index 433c2a20c6..bcc0823781 100644 --- a/setup.rst +++ b/setup.rst @@ -24,12 +24,12 @@ Getting Set Up Version Control Setup --------------------- -CPython is developed using `Mercurial `_. The Mercurial -command line program is named ``hg``; this is also used to refer to Mercurial -itself. Mercurial is easily available for common Unix systems by way of the -standard package manager; under Windows, you might want to use the -`TortoiseHg `_ graphical client, but the build system -still prefers :file:`hg.exe` to be on your PATH. +CPython is developed using `Git `_. The Git command line +program is named ``git``; this is also used to refer to Git itself. Git is +easily available for common Unix systems by way of the standard package manager; +under Windows, you might want to use the `TortoiseGit `_ +graphical client, but the build system still prefers :file:`git.exe` to be on +your PATH. .. _checkout: @@ -49,13 +49,13 @@ To get a working copy of the :ref:`in-development ` branch of CPython (core developers use a different URL as outlined in :ref:`coredev`), run:: - hg clone https://hg.python.org/cpython + git clone https://github.com/python/cpython If you want a working copy of an already-released version of Python, i.e., a version in :ref:`maintenance mode `, you can update your working copy. For instance, to update your working copy to Python 3.5, do:: - hg update 3.5 + git checkout 3.5 You will need to re-compile CPython when you do such an update. @@ -75,17 +75,15 @@ Compiling (for debugging) CPython provides several compilation flags which help with debugging various things. While all of the known flags can be found in the -``Misc/SpecialBuilds.txt`` -file, the most critical one is the ``Py_DEBUG`` flag which creates what is -known as a "pydebug" build. This flag turns on -various extra sanity checks which help catch common issues. The use of the flag -is so common that turning on the flag is a basic compile option. +``Misc/SpecialBuilds.txt`` file, the most critical one is the ``Py_DEBUG`` flag +which creates what is known as a "pydebug" build. This flag turns on various +extra sanity checks which help catch common issues. The use of the flag is so +common that turning on the flag is a basic compile option. -You should always -develop under a pydebug build of CPython (the only instance of when you -shouldn't is if you are taking performance measurements). Even when working -only on pure Python code the pydebug build provides several useful checks that -one should not skip. +You should always develop under a pydebug build of CPython (the only instance of +when you shouldn't is if you are taking performance measurements). Even when +working only on pure Python code the pydebug build provides several useful +checks that one should not skip. .. _build-dependencies: @@ -266,7 +264,7 @@ still build properly). Windows ''''''' -The `readme `_ +The `readme `_ included in the solution has more details, especially on what additional software is required to build which parts of Python. @@ -346,16 +344,8 @@ when trying to build an old (2.x) Python with a new (3.x) Python installed, or vice versa. To overcome this problem, auto-generated files are also checked into the -Mercurial repository. So if you don't touch the auto-generation scripts, there's -no real need to auto-generate anything. However, as Mercurial doesn't preserve -timestamps well, a special build target ``touch`` was added (the ``touch`` -build target is not designed for git clones and does not support them). Run:: - - make touch - -Before running the compilation ``make``. This will tweak the timestamps of the -auto-generated files in a way that makes it unnecessary to create them anew and -henceforth the compilation should not require an installed Python interpreter. +Git repository. So if you don't touch the auto-generation scripts, there's +no real need to auto-generate anything. Editors and Tools ================= From 468b53d596c394eb35307589fd923a8a9c2eacdc Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 21 Oct 2016 12:24:32 -0700 Subject: [PATCH 5/6] Don't refer to py3k --- index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.rst b/index.rst index b60808a5e6..4189250b17 100644 --- a/index.rst +++ b/index.rst @@ -222,7 +222,7 @@ Key Resources * `Buildbot status`_ * Source code * `Browse online `_ - * `Snapshot of py3k `_ + * `Snapshot of the ``master`` branch `_ * `Daily OS X installer `_ * PEPs_ (Python Enhancement Proposals) * :doc:`faq` From 9100c2dcc81fba0ae31b28af1c8e82a7286b06b3 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 21 Oct 2016 12:25:46 -0700 Subject: [PATCH 6/6] Don't use ticks in a link --- index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.rst b/index.rst index 4189250b17..225ad208c4 100644 --- a/index.rst +++ b/index.rst @@ -222,7 +222,7 @@ Key Resources * `Buildbot status`_ * Source code * `Browse online `_ - * `Snapshot of the ``master`` branch `_ + * `Snapshot of the *master* branch `_ * `Daily OS X installer `_ * PEPs_ (Python Enhancement Proposals) * :doc:`faq`