Commit 0c9d7a70 authored by Jason R. Coombs's avatar Jason R. Coombs Committed by GitHub

Merge pull request #1868 from benoit-pierre/drop-most-documentation-references-to-easy_install

doc: drop most references to EasyInstall
parents ca45fb96 4c0e2044
Drop most documentation references to (deprecated) EasyInstall.
...@@ -7,7 +7,7 @@ Authority (PyPA) and led by Jason R. Coombs. ...@@ -7,7 +7,7 @@ Authority (PyPA) and led by Jason R. Coombs.
This document describes the process by which Setuptools is developed. This document describes the process by which Setuptools is developed.
This document assumes the reader has some passing familiarity with This document assumes the reader has some passing familiarity with
*using* setuptools, the ``pkg_resources`` module, and EasyInstall. It *using* setuptools, the ``pkg_resources`` module, and pip. It
does not attempt to explain basic concepts like inter-project does not attempt to explain basic concepts like inter-project
dependencies, nor does it contain detailed lexical syntax for most dependencies, nor does it contain detailed lexical syntax for most
file formats. Neither does it explain concepts like "namespace file formats. Neither does it explain concepts like "namespace
......
...@@ -299,11 +299,8 @@ specified by the ``setup_requires`` parameter to the Distribution. ...@@ -299,11 +299,8 @@ specified by the ``setup_requires`` parameter to the Distribution.
A list of dependency URLs, one per line, as specified using the A list of dependency URLs, one per line, as specified using the
``dependency_links`` keyword to ``setup()``. These may be direct ``dependency_links`` keyword to ``setup()``. These may be direct
download URLs, or the URLs of web pages containing direct download download URLs, or the URLs of web pages containing direct download
links, and will be used by EasyInstall to find dependencies, as though links. Please see the setuptools manual for more information on
the user had manually provided them via the ``--find-links`` command specifying this option.
line option. Please see the setuptools manual and EasyInstall manual
for more information on specifying this option, and for information on
how EasyInstall processes ``--find-links`` URLs.
``depends.txt`` -- Obsolete, do not create! ``depends.txt`` -- Obsolete, do not create!
......
...@@ -245,8 +245,8 @@ abbreviation for ``pkg_resources.working_set.require()``: ...@@ -245,8 +245,8 @@ abbreviation for ``pkg_resources.working_set.require()``:
interactive interpreter hacking than for production use. If you're creating interactive interpreter hacking than for production use. If you're creating
an actual library or application, it's strongly recommended that you create an actual library or application, it's strongly recommended that you create
a "setup.py" script using ``setuptools``, and declare all your requirements a "setup.py" script using ``setuptools``, and declare all your requirements
there. That way, tools like EasyInstall can automatically detect what there. That way, tools like pip can automatically detect what requirements
requirements your package has, and deal with them accordingly. your package has, and deal with them accordingly.
Note that calling ``require('SomePackage')`` will not install Note that calling ``require('SomePackage')`` will not install
``SomePackage`` if it isn't already present. If you need to do this, you ``SomePackage`` if it isn't already present. If you need to do this, you
...@@ -611,9 +611,9 @@ Requirements Parsing ...@@ -611,9 +611,9 @@ Requirements Parsing
or activation of both Report-O-Rama and any libraries it needs in order to or activation of both Report-O-Rama and any libraries it needs in order to
provide PDF support. For example, you could use:: provide PDF support. For example, you could use::
easy_install.py Report-O-Rama[PDF] pip install Report-O-Rama[PDF]
To install the necessary packages using the EasyInstall program, or call To install the necessary packages using pip, or call
``pkg_resources.require('Report-O-Rama[PDF]')`` to add the necessary ``pkg_resources.require('Report-O-Rama[PDF]')`` to add the necessary
distributions to sys.path at runtime. distributions to sys.path at runtime.
...@@ -1843,9 +1843,9 @@ History ...@@ -1843,9 +1843,9 @@ History
because it isn't necessarily a filesystem path (and hasn't been for some because it isn't necessarily a filesystem path (and hasn't been for some
time now). The ``location`` of ``Distribution`` objects in the filesystem time now). The ``location`` of ``Distribution`` objects in the filesystem
should always be normalized using ``pkg_resources.normalize_path()``; all should always be normalized using ``pkg_resources.normalize_path()``; all
of the setuptools and EasyInstall code that generates distributions from of the setuptools' code that generates distributions from the filesystem
the filesystem (including ``Distribution.from_filename()``) ensure this (including ``Distribution.from_filename()``) ensure this invariant, but if
invariant, but if you use a more generic API like ``Distribution()`` or you use a more generic API like ``Distribution()`` or
``Distribution.from_location()`` you should take care that you don't ``Distribution.from_location()`` you should take care that you don't
create a distribution with an un-normalized filesystem path. create a distribution with an un-normalized filesystem path.
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment