diff --git a/CHANGES.txt b/CHANGES.txt index 3cefa2c10e32ce59a94f5d4b6199bcfa70494089..550b1f6b0dfc9da19a8dbe6041776829a8019b6a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -14,10 +14,6 @@ Change History 1.0.0b32 (2007-???) ===================== -- The list of eggs in generated scripts is sorted and duplicates - removed. This prevents problems in WingIDE and makes it easier for - humans to look at and use the list of eggs. - - Added a french translation of the buildout tutorial 1.0.0b31 (2007-11-01) diff --git a/src/zc/buildout/easy_install.py b/src/zc/buildout/easy_install.py index 5d1fa01e3299aa3844bf947a8b6e3d6fd9e201dc..4d096c6de06720c84135f4012d475baac31adf8a 100644 --- a/src/zc/buildout/easy_install.py +++ b/src/zc/buildout/easy_install.py @@ -849,9 +849,6 @@ def scripts(reqs, working_set, executable, dest, path = [dist.location for dist in working_set] path.extend(extra_paths) - # sort and remove duplicates - path = list(set(path)) - path.sort() path = repr(path)[1:-1].replace(', ', ',\n ') generated = [] diff --git a/src/zc/buildout/easy_install.txt b/src/zc/buildout/easy_install.txt index 52f2dc585a71f8468d0f7e7ff48b3801af2d730b..8dca3167e0705c24ec573466cfdd2ed0bc837eab 100644 --- a/src/zc/buildout/easy_install.txt +++ b/src/zc/buildout/easy_install.txt @@ -681,9 +681,9 @@ to be included in the a generated script: <BLANKLINE> import sys sys.path[0:0] = [ - '/foo/bar', '/sample-install/demo-0.3-py2.4.egg', '/sample-install/demoneeded-1.1-py2.4.egg', + '/foo/bar', ] <BLANKLINE> import eggrecipedemo diff --git a/src/zc/buildout/update.txt b/src/zc/buildout/update.txt index 5213301ed5697a099f4156e59def1e022bb3b6f8..13c91fcaa4a2ed3459bebfc4b65bb7b8cf47fe2d 100644 --- a/src/zc/buildout/update.txt +++ b/src/zc/buildout/update.txt @@ -85,8 +85,8 @@ Our buildout script has been updated to use the new eggs: <BLANKLINE> import sys sys.path[0:0] = [ - '/sample-buildout/eggs/setuptools-99.99-py2.4.egg', '/sample-buildout/eggs/zc.buildout-99.99-py2.4.egg', + '/sample-buildout/eggs/setuptools-99.99-py2.4.egg', ] <BLANKLINE> import zc.buildout.buildout diff --git a/zc.recipe.egg_/src/zc/recipe/egg/README.txt b/zc.recipe.egg_/src/zc/recipe/egg/README.txt index 38957ebdfd3e0e15ca259c2676675f9821c54077..94d5b6b73426b2643fe7067a616fd23a0f817659 100644 --- a/zc.recipe.egg_/src/zc/recipe/egg/README.txt +++ b/zc.recipe.egg_/src/zc/recipe/egg/README.txt @@ -358,9 +358,9 @@ Let's look at the script that was generated: <BLANKLINE> import sys sys.path[0:0] = [ - '/foo/bar', '/sample-buildout/eggs/demo-0.4c1-py2.4.egg', '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg', + '/foo/bar', '/spam/eggs', ] <BLANKLINE> @@ -405,9 +405,9 @@ to be included in generated scripts: <BLANKLINE> import sys sys.path[0:0] = [ - '/foo/bar', '/sample-buildout/eggs/demo-0.4c1-py2.4.egg', '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg', + '/foo/bar', '/spam/eggs', ] <BLANKLINE> @@ -463,9 +463,9 @@ declare entry points using the entry-points option: <BLANKLINE> import sys sys.path[0:0] = [ - '/foo/bar', '/sample-buildout/eggs/demo-0.4c1-py2.4.egg', '/sample-buildout/eggs/demoneeded-1.2c1-py2.4.egg', + '/foo/bar', '/spam/eggs', ] <BLANKLINE>