summaryrefslogtreecommitdiff
path: root/MERGE.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-03 10:53:48 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-03 10:53:48 -0400
commit3b7000ad8a3eba032d4d2654e31ae64c976cb494 (patch)
tree07f8362d76f3ea7a4910a4152c949cf20e2dae66 /MERGE.txt
parentf179cf165b6c519790488127ae721204df62dd54 (diff)
parentb33cf3e333837cf2fa04af79bcd46094a047741b (diff)
downloadpython-setuptools-git-3b7000ad8a3eba032d4d2654e31ae64c976cb494.tar.gz
Merge setuptools.command.easy_install
--HG-- branch : Setuptools-Distribute merge
Diffstat (limited to 'MERGE.txt')
-rw-r--r--MERGE.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/MERGE.txt b/MERGE.txt
index 550273fb..df2689f3 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -8,6 +8,8 @@ Major Changes
* Python 3 support.
* Improved support for GAE.
+* Support `PEP-370 <http://www.python.org/dev/peps/pep-0370/>`_ per-user site
+ packages.
* Sort order of Distributions in pkg_resources now prefers PyPI to external
links (Distribute issue 163).
@@ -16,6 +18,9 @@ Minor Changes
* Wording of some output has changed to replace contractions with their
canonical form (i.e. prefer "could not" to "couldn't").
+* Manifest files are no longer written for .exe launchers. The
+ Distribute-based script launchers are used and they launch Python as a
+ subprocess, rather than loading the Python DLL in-process.
Differences from Distribute 0.6.35: