[pypy-commit] pypy default: Issue #1958

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r75262:0f3ee2ce246e
Date: 2015-01-09 00:21 +0100
http://bitbucket.org/pypy/pypy/changeset/0f3ee2ce246e/

Log:	Issue #1958

	Maybe temporary: just kill references to "distribute". I think that
	installing pip as described in the other lines of the instructions
	will get us a complete setuptools environment anyway.

diff --git a/pypy/doc/install.rst b/pypy/doc/install.rst
--- a/pypy/doc/install.rst
+++ b/pypy/doc/install.rst
@@ -38,14 +38,13 @@
 and not move the binary there, else PyPy would not be able to find its
 library.
 
-If you want to install 3rd party libraries, the most convenient way is to
-install distribute_ and pip_:
+If you want to install 3rd party libraries, the most convenient way is
+to install pip_ (unless you want to install virtualenv as explained
+below; then you can directly use pip inside virtualenvs):
 
 .. code-block:: console
 
-    $ curl -O http://python-distribute.org/distribute_setup.py
     $ curl -O https://raw.githubusercontent.com/pypa/pip/master/contrib/get-pip.py
-    $ ./pypy-2.1/bin/pypy distribute_setup.py
     $ ./pypy-2.1/bin/pypy get-pip.py
     $ ./pypy-2.1/bin/pip install pygments  # for example
 
@@ -69,7 +68,6 @@
 
 Note that bin/python is now a symlink to bin/pypy.
 
-.. _distribute: http://www.python-distribute.org/
 .. _pip: http://pypi.python.org/pypi/pip