[Python-checkins] peps (merge default -> default): merge

[eli.bendersky]

http://hg.python.org/peps/rev/c7823b36b38c
changeset:   4846:c7823b36b38c
parent:      4845:1b6452d05925
parent:      4844:cf603e458680
user:        Eli Bendersky <eliben at gmail.com>
date:        Tue Apr 09 21:19:14 2013 -0700
summary:
  merge

files:
  pep-0439.txt |  28 ++++++++++++++--------------
  1 files changed, 14 insertions(+), 14 deletions(-)


diff --git a/pep-0439.txt b/pep-0439.txt
--- a/pep-0439.txt
+++ b/pep-0439.txt
@@ -22,7 +22,7 @@
 
 This PEP does not propose to include the pip implementation in the
 Python standard library.  Nor does it propose to implement any package
-management or installation mechanisms beyond those provided by PEPs
+management or installation mechanisms beyond those provided by PEP
 427 ("The Wheel Binary Package Format 1.0") and TODO distlib PEP.
 
 
@@ -62,11 +62,11 @@
 The pip bootstrap
 -----------------
 
-The Python installation includes an executable called "pip" that attempts to
-import pip machinery.  If it can then the pip command proceeds as
-normal.  If it cannot it will bootstrap pip by downloading the pip
-implementation wheel file.  Once installed, the pip command proceeds
-as normal.
+The Python installation includes an executable called "pip3" (see PEP 394 for
+naming rationale etc.) that attempts to import pip machinery.  If it can
+then the pip command proceeds as normal.  If it cannot it will bootstrap pip by
+downloading the pip implementation wheel file.  Once installed, the pip command
+proceeds as normal.
 
 A boostrap is used in the place of a the full pip code so that we
 don't have to bundle pip and also the install tool is upgradeable
@@ -84,9 +84,9 @@
 
 1. The user system has Python (3.4+) installed.  In the "scripts"
    directory of the Python installation there is the bootstrap script
-   called "pip".
-2. The user will invoke a pip command, typically "pip install
-   <package>", for example "pip install Django".
+   called "pip3".
+2. The user will invoke a pip command, typically "pip3 install
+   <package>", for example "pip3 install Django".
 3. The boostrap script will attempt to import the pip implementation.
    If this succeeds, the pip command is processed normally.
 4. On failing to import the pip implementation the bootstrap notifies
@@ -94,7 +94,7 @@
    latest download wheel file (see PEP 427.)
 5. Upon downloading the file it is installed using the distlib
    installation machinery for wheel packages.  Upon completing the
-   installation the user is notified that "pip has been upgraded."
+   installation the user is notified that "pip3 has been upgraded."
    TODO how is it verified?
 6. The pip tool may now import the pip implementation and continues to
    process the requested user command normally.
@@ -102,7 +102,7 @@
 Users may be running in an environment which cannot access the public
 Internet and are relying solely on a local package repository.  They
 would use the "-i" (Base URL of Python Package Index) argument to the
-"pip install" command.  This use case will be handled by:
+"pip3 install" command.  This use case will be handled by:
 
 1. Recognising the command-line arguments that specify alternative or
    additional locations to discover packages and attempting to
@@ -115,7 +115,7 @@
    the file manually.
 
 Manual installation of the pip implementation will be supported
-through the manual download of the wheel file and "pip install
+through the manual download of the wheel file and "pip3 install
 <downloaded wheel file>".
 
 This installation will not perform standard pip installation steps of
@@ -130,10 +130,10 @@
 the downloaded file.
 
 Beyond those arguments controlling index location and download
-options, the "pip" boostrap command may support further standard pip
+options, the "pip3" boostrap command may support further standard pip
 options for verbosity, quietness and logging.
 
-The "--no-install" option to the "pip" command will not affect the
+The "--no-install" option to the "pip3" command will not affect the
 bootstrapping process.
 
 setuptools

-- 
Repository URL: http://hg.python.org/peps