summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Smith <qwcode@gmail.com>2014-03-26 11:05:23 -0700
committerMarcus Smith <qwcode@gmail.com>2014-03-26 11:08:00 -0700
commit6ab9b30587b7a721111ef8842e3dbce7c7c3cefc (patch)
tree9b59048f6a7f87014a1e69112a69f66907f84dd5
parentd4b691b743a91500cf49119d28a805db8313f129 (diff)
downloadpip-6ab9b30587b7a721111ef8842e3dbce7c7c3cefc.tar.gz
pip upgrades on windows
-rw-r--r--docs/installing.rst32
1 files changed, 27 insertions, 5 deletions
diff --git a/docs/installing.rst b/docs/installing.rst
index 8243cb5e9..16b925761 100644
--- a/docs/installing.rst
+++ b/docs/installing.rst
@@ -17,15 +17,15 @@ 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://raw.github.com/pypa/pip/master/contrib/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]_
@@ -33,6 +33,24 @@ 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
+
+
+On Windows [4]_:
+
+::
+
+ python -m pip install -U pip
+
+
+
Using Package Managers
----------------------
@@ -42,12 +60,14 @@ 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
@@ -62,5 +82,7 @@ On Fedora::
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