Ticket #9995: easy_install_2_pip.patch

File easy_install_2_pip.patch, 5.6 KB (added by paulcollins, 3 years ago)

something to kick off the discussion again (missed an _ last time)

  • docs/internals/contributing/writing-documentation.txt

    diff --git docs/internals/contributing/writing-documentation.txt docs/internals/contributing/writing-documentation.txt
    index 2d08dba..f818392 100644
    __ http://sphinx.pocoo.org/ 
    2929__ http://docutils.sourceforge.net/
    3030
    3131To actually build the documentation locally, you'll currently need to install
    32 Sphinx -- ``easy_install Sphinx`` should do the trick.
     32Sphinx -- ``pip install Sphinx`` should do the trick.
    3333
    3434.. note::
    3535
  • docs/intro/whatsnext.txt

    diff --git docs/intro/whatsnext.txt docs/intro/whatsnext.txt
    index fed8a71..d02fed8 100644
    You can get a local copy of the HTML documentation following a few easy steps: 
    166166
    167167    * Django's documentation uses a system called Sphinx__ to convert from
    168168      plain text to HTML. You'll need to install Sphinx by either downloading
    169       and installing the package from the Sphinx Web site, or by Python's
    170       ``easy_install``:
     169      and installing the package from the Sphinx Web site, or by using
     170      ``pip``:
    171171
    172172      .. code-block:: bash
    173173
    174             $ easy_install Sphinx
     174            $ pip install Sphinx
    175175
    176176    * Then, just use the included ``Makefile`` to turn the documentation into
    177177      HTML:
  • docs/ref/contrib/gis/install.txt

    diff --git docs/ref/contrib/gis/install.txt docs/ref/contrib/gis/install.txt
    index 0a5cbc5..bd7deec 100644
    psycopg2 
    806806After you've installed the KyngChaos binaries and modified your ``PATH``, as
    807807described above, ``psycopg2`` may be installed using the following command::
    808808
    809     $ sudo python easy_install psycopg2
     809    $ sudo pip install psycopg2
    810810
    811811.. note::
    812812
    813    To use ``easy_install`` you'll need to install Python's `setuptools`_.
     813   To use ``pip`` you'll need to install Python's `pip`_.
    814814
    815 .. _setuptools: http://pypi.python.org/pypi/setuptools
     815.. _pip: http://www.pip-installer.org/en/latest/installing.html#alternative-installation-procedures
    816816
    817817.. _pysqlite2_kyngchaos:
    818818
    Ubuntu 10.04 uses PostGIS 1.4, while Ubuntu 10.10 uses PostGIS 1.5 (with 
    926926geography support).  The installation commands are::
    927927
    928928    $ sudo apt-get install binutils gdal-bin libproj-dev postgresql-8.4-postgis \
    929          postgresql-server-dev-8.4 python-psycopg2 python-setuptools
    930     $ sudo easy_install Django
     929         postgresql-server-dev-8.4 python-psycopg2 python-pip
     930    $ sudo pip install Django
    931931
    932932.. _ibex:
    933933
    geography support). The installation commands are:: 
    937937Use the synaptic package manager to install the following packages::
    938938
    939939    $ sudo apt-get install binutils gdal-bin postgresql-8.3-postgis \
    940         postgresql-server-dev-8.3 python-psycopg2 python-setuptools
     940        postgresql-server-dev-8.3 python-psycopg2 python-pip
    941941
    942 Afterwards, you may install Django with Python's ``easy_install`` script (the
     942Afterwards, you may install Django with Python's ``pip`` installer (the
    943943Ubuntu package ``python-django`` uses an older version missing several
    944944important bug fixes for GeoDjango)::
    945945
    946     $ sudo easy_install Django
     946    $ sudo pip install Django
    947947
    948948That's it!  For the curious, the required binary prerequisites packages are:
    949949
    That's it! For the curious, the required binary prerequisites packages are: 
    955955* ``libgdal1-1.5.0``: for GDAL 1.5.0 library
    956956* ``proj``: for PROJ 4.6.0 -- but no datum shifting files, see note below
    957957* ``python-psycopg2``
    958 * ``python-setuptools``: for ``easy_install``
     958* ``python-pip``
    959959
    960960Optional packages to consider:
    961961
    Binary Packages 
    10121012The following command will install acceptable binary packages, as well as
    10131013the development tools necessary to build the rest of the requirements::
    10141014
    1015     $ sudo apt-get install binutils bzip2 gcc g++ flex make postgresql-8.1 postgresql-server-dev-8.1 python-ctypes python-psycopg2 python-setuptools
     1015    $ sudo apt-get install binutils bzip2 gcc g++ flex make postgresql-8.1
     1016    postgresql-server-dev-8.1 python-ctypes python-psycopg2 python-pip
    10161017
    10171018Required package information:
    10181019
    Required package information: 
    10231024* ``postgresql-8.1``
    10241025* ``postgresql-server-dev-8.1``: for ``pg_config``
    10251026* ``python-psycopg2``
    1026 * ``python-setuptools``: for ``easy_install``
     1027* ``python-pip``
    10271028
    10281029Optional packages:
    10291030
    directions carefully. 
    10431044This version is comparable to Ubuntu :ref:`ibex`, so the command
    10441045is very similar::
    10451046
    1046     $ 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
     1047    $ sudo apt-get install binutils libgdal1-1.5.0 postgresql-8.3
     1048    postgresql-8.3-postgis postgresql-server-dev-8.3 python-psycopg2 python-pip
    10471049
    10481050This assumes that you are using PostgreSQL version 8.3. Else, replace ``8.3``
    10491051in the above command with the appropriate PostgreSQL version.
  • docs/topics/install.txt

    diff --git docs/topics/install.txt docs/topics/install.txt
    index 70b0783..aff338a 100644
    Installing an official release 
    215215These commands will install Django in your Python installation's
    216216``site-packages`` directory.
    217217
     218Alternatively, if you have pip_ installed then you can choose to skip
     219the steps above and simply run the command ``sudo pip install Django``.
     220
    218221.. _bsdtar: http://gnuwin32.sourceforge.net/packages/bsdtar.htm
    219222.. _7-zip: http://www.7-zip.org/
     223.. _pip: http://www.pip-installer.org/en/latest/installing.html#alternative-installation-procedures
    220224
    221225.. _installing-development-version:
    222226
Back to Top