Ticket #9995: easy_install_2_pip.patch

docs/internals/contributing/writing-documentation.txt

@@ -29 +29 @@
 __ http://docutils.sourceforge.net/
 
 To actually build the documentation locally, you'll currently need to install
-Sphinx -- ``easy_install Sphinx`` should do the trick.
+Sphinx -- ``pip install Sphinx`` should do the trick.
 
 .. note::
 

docs/intro/whatsnext.txt

@@ -166 +166 @@
 
     * Django's documentation uses a system called Sphinx__ to convert from
       plain text to HTML. You'll need to install Sphinx by either downloading
-      and installing the package from the Sphinx Web site, or by Python's
-      ``easy_install``:
+      and installing the package from the Sphinx Web site, or by using
+      ``pip``:
 
       .. code-block:: bash
 
-            $ easy_install Sphinx
+            $ pip install Sphinx
 
     * Then, just use the included ``Makefile`` to turn the documentation into
       HTML:

docs/ref/contrib/gis/install.txt

@@ -806 +806 @@
 After you've installed the KyngChaos binaries and modified your ``PATH``, as
 described above, ``psycopg2`` may be installed using the following command::
 
-    $ sudo python easy_install psycopg2
+    $ sudo pip install psycopg2
 
 .. note::
 
-   To use ``easy_install`` you'll need to install Python's `setuptools`_.
+   To use ``pip`` you'll need to install Python's `pip`_.
 
-.. _setuptools: http://pypi.python.org/pypi/setuptools
+.. _pip: http://www.pip-installer.org/en/latest/installing.html#alternative-installation-procedures
 
 .. _pysqlite2_kyngchaos:
 
@@ -926 +926 @@
 geography support).  The installation commands are::
 
     $ sudo apt-get install binutils gdal-bin libproj-dev postgresql-8.4-postgis \
-         postgresql-server-dev-8.4 python-psycopg2 python-setuptools
-    $ sudo easy_install Django
+         postgresql-server-dev-8.4 python-psycopg2 python-pip
+    $ sudo pip install Django
 
 .. _ibex:
 
@@ -937 +937 @@
 Use the synaptic package manager to install the following packages::
 
     $ sudo apt-get install binutils gdal-bin postgresql-8.3-postgis \
-        postgresql-server-dev-8.3 python-psycopg2 python-setuptools
+        postgresql-server-dev-8.3 python-psycopg2 python-pip
 
-Afterwards, you may install Django with Python's ``easy_install`` script (the
+Afterwards, you may install Django with Python's ``pip`` installer (the
 Ubuntu package ``python-django`` uses an older version missing several
 important bug fixes for GeoDjango)::
 
-    $ sudo easy_install Django
+    $ sudo pip install Django
 
 That's it!  For the curious, the required binary prerequisites packages are:
 
@@ -955 +955 @@
 * ``libgdal1-1.5.0``: for GDAL 1.5.0 library
 * ``proj``: for PROJ 4.6.0 -- but no datum shifting files, see note below
 * ``python-psycopg2``
-* ``python-setuptools``: for ``easy_install``
+* ``python-pip``
 
 Optional packages to consider:
 
@@ -1012 +1012 @@
 The following command will install acceptable binary packages, as well as
 the development tools necessary to build the rest of the requirements::
 
-    $ sudo apt-get install binutils bzip2 gcc g++ flex make postgresql-8.1 postgresql-server-dev-8.1 python-ctypes python-psycopg2 python-setuptools
+    $ sudo apt-get install binutils bzip2 gcc g++ flex make postgresql-8.1 
+    postgresql-server-dev-8.1 python-ctypes python-psycopg2 python-pip
 
 Required package information:
 
@@ -1023 +1024 @@
 * ``postgresql-8.1``
 * ``postgresql-server-dev-8.1``: for ``pg_config``
 * ``python-psycopg2``
-* ``python-setuptools``: for ``easy_install``
+* ``python-pip``
 
 Optional packages:
 
@@ -1043 +1044 @@
 This version is comparable to Ubuntu :ref:`ibex`, so the command
 is very similar::
 
-    $ sudo apt-get install binutils libgdal1-1.5.0 postgresql-8.3 postgresql-8.3-postgis postgresql-server-dev-8.3 python-psycopg2 python-setuptools
+    $ sudo apt-get install binutils libgdal1-1.5.0 postgresql-8.3 
+    postgresql-8.3-postgis postgresql-server-dev-8.3 python-psycopg2 python-pip
 
 This assumes that you are using PostgreSQL version 8.3. Else, replace ``8.3``
 in the above command with the appropriate PostgreSQL version.

docs/topics/install.txt

@@ -215 +215 @@
 These commands will install Django in your Python installation's
 ``site-packages`` directory.
 
+Alternatively, if you have pip_ installed then you can choose to skip 
+the steps above and simply run the command ``sudo pip install Django``.
+
 .. _bsdtar: http://gnuwin32.sourceforge.net/packages/bsdtar.htm
 .. _7-zip: http://www.7-zip.org/
+.. _pip: http://www.pip-installer.org/en/latest/installing.html#alternative-installation-procedures
 
 .. _installing-development-version: