From: Nicholas <nick.kobald@gmail.com>
Date: Fri, 21 Jul 2017 06:29:44 +0000 (-0700)
Subject: [2.7] bpo-30964: Mention ensurepip in package installation docs (GH-2795)
X-Git-Tag: v2.7.14rc1~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82a77d38d6dc7df740e7b01b66aeff433730e9ca;p=python

[2.7] bpo-30964: Mention ensurepip in package installation docs (GH-2795)

Adds a new 'Pip not installed' section that covers
running `ensurepip` manually, and also references
the relevant section of the Python Packaging User
Guide.

(cherry picked from commit b3527bfefd7a0188d43a2d7515ac6addd97a8202)
---

diff --git a/Doc/installing/index.rst b/Doc/installing/index.rst
index e5b3165167..cbbb882406 100644
--- a/Doc/installing/index.rst
+++ b/Doc/installing/index.rst
@@ -193,6 +193,17 @@ On such systems, it is often better to use a virtual environment or a
 per-user installation when installing packages with ``pip``.
 
 
+Pip not installed
+-----------------
+
+It is possible that ``pip`` does not get installed by default. One potential fix is::
+
+    python -m ensurepip --default-pip
+
+There are also additional resources for `installing pip.
+<https://packaging.python.org/tutorials/installing-packages/#install-pip-setuptools-and-wheel>`__
+
+
 Installing binary extensions
 ----------------------------
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 35c77b67a6..662db9f40f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -739,6 +739,7 @@ Kim Knapp
 Lenny Kneler
 Pat Knight
 Jeff Knupp
+Nicholas Kobald
 Kubilay Kocak
 Greg Kochanski
 Manvisha Kodali