summaryrefslogtreecommitdiff
path: root/docs/installing.rst
diff options
context:
space:
mode:
Diffstat (limited to 'docs/installing.rst')
-rw-r--r--docs/installing.rst50
1 files changed, 39 insertions, 11 deletions
diff --git a/docs/installing.rst b/docs/installing.rst
index d2c7f0242..ab0083503 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -17,21 +17,38 @@ pip works on Unix/Linux, OS X, and Windows.
.. _`get-pip`:
-Install or Upgrade pip
-----------------------
+Install pip
+-----------
To install or upgrade pip, securely download `get-pip.py
<https://bootstrap.pypa.io/get-pip.py>`_. [1]_
Then run the following (which may require administrator access)::
- $ python get-pip.py
+ python get-pip.py
+
+If `setuptools`_ (or `distribute`_) is not already installed, ``get-pip.py`` will
+install `setuptools`_ for you. [2]_
+
+To upgrade an existing `setuptools`_ (or `distribute`_), run ``pip install -U setuptools`` [3]_
+
+
+Upgrade pip
+-----------
+
+On Linux or OS X:
+
+::
+
+ pip install -U pip
-.. note::
- Beginning with v1.5.1, pip does not require `setuptools`_ prior to running
- `get-pip.py`. Additionally, if `setuptools`_ (or `distribute`_) is not
- already installed, `get-pip.py` will install `setuptools`_ for you.
+On Windows [4]_:
+
+::
+
+ python -m pip install -U pip
+
Using Package Managers
@@ -43,18 +60,29 @@ unavailable.
On Debian and Ubuntu::
- $ sudo apt-get install python-pip
+ sudo apt-get install python-pip
On Fedora::
- $ sudo yum install python-pip
+ sudo yum install python-pip
+----
+
.. [1] "Secure" in this context means using a modern browser or a
tool like `curl` that verifies SSL certificates when downloading from
https URLs.
-.. _setuptools: https://pypi.python.org/pypi/setuptools
-.. _distribute: https://pypi.python.org/pypi/distribute
+.. [2] Beginning with pip v1.5.1, ``get-pip.py`` stopped requiring setuptools to
+ be installed first.
+
+.. [3] Although using ``pip install --upgrade setuptools`` to upgrade from
+ distribute to setuptools works in isolation, it's possible to get
+ "ImportError: No module named setuptools" when using pip<1.4 to upgrade a
+ package that depends on setuptools or distribute. See :doc:`here for
+ details <distribute_setuptools>`.
+.. [4] https://github.com/pypa/pip/issues/1299
+.. _setuptools: https://pypi.python.org/pypi/setuptools
+.. _distribute: https://pypi.python.org/pypi/distribute