summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/index.rst3
-rw-r--r--doc/install.rst11
2 files changed, 9 insertions, 5 deletions
diff --git a/doc/index.rst b/doc/index.rst
index 6fc7a057..474e782f 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -24,6 +24,7 @@ coverage.py
:history: 20120429T162100, updated for 3.5.2b1
:history: 20120503T233800, updated for 3.5.2
:history: 20120929T093500, updated for 3.5.3
+:history: 20121117T094900, Change from easy_install to pip.
Coverage.py is a tool for measuring code coverage of Python programs. It
@@ -55,7 +56,7 @@ Quick start
Getting started is easy:
#. Install coverage.py from the `coverage page on the Python Package Index`_,
- or by using "easy_install coverage". For a few more details, see
+ or by using "pip install coverage". For a few more details, see
:ref:`install`.
#. Use ``coverage run`` to run your program and gather data:
diff --git a/doc/install.rst b/doc/install.rst
index ffce72fa..91021b1b 100644
--- a/doc/install.rst
+++ b/doc/install.rst
@@ -13,13 +13,17 @@ Installation
:history: 20120429T162500, updated for 3.5.2b1.
:history: 20120503T234000, updated for 3.5.2.
:history: 20120929T093600, updated for 3.5.3.
+:history: 20121117T095000, Now setuptools is a pre-req.
.. highlight:: console
.. _coverage_pypi: http://pypi.python.org/pypi/coverage
+.. _setuptools: http://pypi.python.org/pypi/setuptools
+.. _Distribute: http://packages.python.org/distribute/
-Installing coverage.py is fairly standard:
+Installing coverage.py is done in the usual ways. You must have `setuptools`_
+or `Distribute`_ installed already, and then you:
#. Download the appropriate kit from the
`coverage page on the Python Package Index`__.
@@ -28,11 +32,11 @@ Installing coverage.py is fairly standard:
or, use::
- $ easy_install coverage
+ $ pip install coverage
or even::
- $ pip install coverage
+ $ easy_install coverage
.. __: coverage_pypi_
@@ -55,7 +59,6 @@ installed as a pre-requisite, but otherwise are self-contained. They have the
C extension pre-compiled so there's no need to worry about compilers.
.. __: coverage_pypi_
-.. _setuptools: http://pypi.python.org/pypi/setuptools
Checking the installation