summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortarek <none@none>2009-12-02 17:07:26 +0100
committertarek <none@none>2009-12-02 17:07:26 +0100
commitca0105cf105e6d8a6c3e552c82650de93dbe13b1 (patch)
treec0777160957fef89d09e022869a2290ffd30fcb9
parent67b9811dc7c6b59e5815e5b27620ef3e416488ac (diff)
downloadpython-setuptools-git-ca0105cf105e6d8a6c3e552c82650de93dbe13b1.tar.gz
more info about easy_install and setup.cfg refs #99
--HG-- branch : distribute extra : rebase_source : 390f6492ac8aee653132791ac32f90bc1434433a
-rw-r--r--CHANGES.txt6
-rw-r--r--docs/easy_install.txt7
2 files changed, 9 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e6d2a678..608a278e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,8 +15,10 @@ CHANGES
* Issue 80: test_develop now works with Python 3.1
* Issue 93: upload_docs now works if there is an empty sub-directory.
* Issue 70: exec bit on non-exec files
-* Issue 99: now easy_install doesn't usesa "setup.cfg" if any exists in
- the working directory.
+* Issue 99: now the standalone easy_install command doesn't uses a
+ "setup.cfg" if any exists in the working directory. It will use it
+ only if triggered by ``install_requires`` from a setup.py call
+ (install, develop, etc).
-----
0.6.8
diff --git a/docs/easy_install.txt b/docs/easy_install.txt
index 5fa83542..3e39b811 100644
--- a/docs/easy_install.txt
+++ b/docs/easy_install.txt
@@ -628,6 +628,9 @@ until and unless you override them explicitly in an ``[easy_install]`` section.
For more information, see also the current Python documentation on the `use and
location of distutils configuration files <http://docs.python.org/inst/config-syntax.html>`_.
+Notice that ``easy_install`` will use the ``setup.cfg`` from the current
+working directory only if it was triggered from ``setup.py`` through the
+``install_requires`` option. The standalone command will not use that file.
Command-Line Options
--------------------
@@ -904,7 +907,7 @@ Command-Line Options
projects, not in-development ones, because such projects may not
have a currently-valid version number. So, it usually only installs them
when their ``setup.py`` directory is explicitly passed on the command line.
-
+
However, if this option is used, then any in-development projects that were
installed using the ``setup.py develop`` command, will be used to build
eggs, effectively upgrading the "in-development" project to a snapshot
@@ -1257,7 +1260,7 @@ History
installed using ``setup.py develop``.
* Fixed not HTML-decoding URLs scraped from web pages
-
+
0.6c5
* Fixed ``.dll`` files on Cygwin not having executable permisions when an egg
is installed unzipped.