diff --git a/source/setup.rst b/source/setup.rst index 6c213b7d7..a46860102 100644 --- a/source/setup.rst +++ b/source/setup.rst @@ -3,9 +3,9 @@ Installing the Tools ==================== :Page Status: Complete -:Last Reviewed: 2013-10-29 +:Last Reviewed: 2014-1-14 -Instructions for installing or upgrading :ref:`setuptools`, :ref:`pip`, +Instructions for installing or upgrading :ref:`pip`, :ref:`setuptools`, :ref:`wheel`, and :ref:`virtualenv`, the :doc:`recommended ` tools for Python packaging and installation. @@ -15,39 +15,41 @@ OSX). Unfortunately, there is often delay in getting the latest version this way, so in most cases, you'll want to use the instructions below. -setuptools ----------- +pip +--- + +To install or upgrade pip, securely download `get-pip.py +`_. [1]_ -To install setuptools from scratch: +Then run the following (which may require administrator access):: -1. Securely download `ez_setup.py - `_. [2]_ + $ python get-pip.py -2. Then run the following (which may require administrator access):: +.. note:: - $ python ez_setup.py + Beginning with v1.5.1, pip does not require :ref:`setuptools` prior to running + `get-pip.py`. Additionally, if :ref:`setuptools` (or `distribute`_) is not + already installed, `get-pip.py` will install :ref:`setuptools` for you. - .. warning:: +setuptools +---------- - Prior to Setuptools-1.0, `ez_setup.py` was not secure, and is currently - only secure when your environment contains secure versions of either - `curl`, `wget`, or `powershell`. [2]_ If you're not sure if you're - environment fulfills this requirement, then the safest approach is to - securely download the setuptools archive directly from :term:`PyPI `, unpack it, and run "python setup.py install" from - inside the unpacked directory. +If ``get-pip.py`` (see above) was not used to install :ref:`pip`, then +you can install or upgrade :ref:`setuptools` like so: +To install setuptools -To upgrade a previous install of :ref:`setuptools` or `distribute`_, there are two -scenarios. +:: +$ pip install setuptools -1. You currently have *some* version of pip. - :: +To upgrade setuptools: - $ pip install --upgrade setuptools +:: + +$ pip install --upgrade setuptools .. note:: @@ -55,27 +57,9 @@ scenarios. is just a wrapper, that depends on setuptools. The end result will be that you have distribute-0.7.X (which does nothing) *and* the latest setuptools installed. If you'd prefer not to end up with the distribute wrapper, - then instead, run ``$ pip uninstall distribute``, then go back to step #1 - above which installs setuptools from scratch. - -2. You currently don't have pip. + then instead, run ``$ pip uninstall distribute``, then ``$ pip install + setuptools``. - Follow the pip install procedure below, then come back and run:: - - $ pip install --upgrade setuptools - - -pip ---- - -pip requires :ref:`setuptools`, which has to be installed first (see section above), before pip can run. [1]_ - -Securely download `get-pip.py `_. [2]_ - -Then run the following (which may require administrator access), to install (or upgrade to) the -latest version of pip:: - - $ python get-pip.py wheel @@ -99,10 +83,7 @@ To install or upgrade, run the following (which may require administrator access ---- -.. [1] As of pip 1.4, pip started requiring :ref:`setuptools`, not `distribute`_ - (a fork of setuptools). :ref:`setuptools` and `distribute`_ are now merged - back together as "setuptools". -.. [2] "Secure" in this context means using a modern browser or a +.. [1] "Secure" in this context means using a modern browser or a tool like `curl` that verifies SSL certificates when downloading from https URLs.