diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-03-30 16:32:07 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-03-30 16:32:07 -0400 |
| commit | 4a327c5c8d2cae9d8abdc26109e4bae2f6f325e4 (patch) | |
| tree | 08fd4f80a537a536ac4564e1189d2f3b3774cc73 | |
| parent | 79c654f4976d7e5258feef30c7d948665ac7d8cb (diff) | |
| download | external_python_setuptools-4a327c5c8d2cae9d8abdc26109e4bae2f6f325e4.tar.gz external_python_setuptools-4a327c5c8d2cae9d8abdc26109e4bae2f6f325e4.tar.bz2 external_python_setuptools-4a327c5c8d2cae9d8abdc26109e4bae2f6f325e4.zip | |
Adding MERGE notes
--HG--
branch : Setuptools-Distribute merge
extra : source : c404c8580bd1450d84cc4f0f32245ebd1130bcfc
| -rw-r--r-- | MERGE.txt | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/MERGE.txt b/MERGE.txt new file mode 100644 index 00000000..e4cd20a0 --- /dev/null +++ b/MERGE.txt @@ -0,0 +1,25 @@ +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. |