summaryrefslogtreecommitdiff
path: root/MERGE.txt
diff options
context:
space:
mode:
Diffstat (limited to 'MERGE.txt')
-rw-r--r--MERGE.txt41
1 files changed, 41 insertions, 0 deletions
diff --git a/MERGE.txt b/MERGE.txt
new file mode 100644
index 00000000..550273fb
--- /dev/null
+++ b/MERGE.txt
@@ -0,0 +1,41 @@
+With the merge of Setuptools and Distribute, the following concessions were
+made:
+
+Differences from setuptools 0.6c12:
+
+Major Changes
+-------------
+
+* Python 3 support.
+* Improved support for GAE.
+* Sort order of Distributions in pkg_resources now prefers PyPI to external
+ links (Distribute issue 163).
+
+Minor Changes
+-------------
+
+* Wording of some output has changed to replace contractions with their
+ canonical form (i.e. prefer "could not" to "couldn't").
+
+Differences from Distribute 0.6.35:
+
+Major Changes
+-------------
+
+* The _distribute property of the setuptools module has been removed.
+* Distributions are once again installed as zipped eggs by default, per the
+ rationale given in `the seminal bug report
+ <http://bugs.python.org/setuptools/issue33>`_ indicates that the feature
+ should remain and no substantial justification was given in the `Distribute
+ report <https://bitbucket.org/tarek/distribute/issue/19/>`_.
+
+Minor Changes
+-------------
+
+* The patch for `#174 <https://bitbucket.org/tarek/distribute/issue/174>`_
+ has been rolled-back, as the comment on the ticket indicates that the patch
+ addressed a symptom and not the fundamental issue.
+* ``easy_install`` (the command) once again honors setup.cfg if found in the
+ current directory. The "mis-behavior" characterized in `#99
+ <https://bitbucket.org/tarek/distribute/issue/99>`_ is actually intended
+ behavior, and no substantial rationale was given for the deviation.