[Checkins] SVN: zc.buildout/branches/2/zc.recipe.egg_/s removed support for setuptools in favour of distribute from zc.recipe.egg

[Thomas Lotze]

Log message for revision 121939:
  removed support for setuptools in favour of distribute from zc.recipe.egg

Changed:
  U   zc.buildout/branches/2/zc.recipe.egg_/setup.py
  U   zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/README.txt
  U   zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/api.txt
  U   zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/egg.py
  U   zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/tests.py

-=-
Modified: zc.buildout/branches/2/zc.recipe.egg_/setup.py
===================================================================
--- zc.buildout/branches/2/zc.recipe.egg_/setup.py	2011-06-15 05:39:48 UTC (rev 121938)
+++ zc.buildout/branches/2/zc.recipe.egg_/setup.py	2011-06-15 05:40:52 UTC (rev 121939)
@@ -63,7 +63,7 @@
     namespace_packages = ['zc', 'zc.recipe'],
     install_requires = [
         'zc.buildout >=1.5.0',
-        'setuptools'],
+        'distribute'],
     tests_require = ['zope.testing'],
     test_suite = name+'.tests.test_suite',
     entry_points = {'zc.buildout': ['default = %s:Scripts' % name,

Modified: zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2011-06-15 05:39:48 UTC (rev 121938)
+++ zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2011-06-15 05:40:52 UTC (rev 121939)
@@ -73,7 +73,7 @@
     >>> ls(sample_buildout, 'eggs')
     -  demo-0.2-py2.3.egg
     -  demoneeded-1.2c1-py2.3.egg
-    -  setuptools-0.6-py2.3.egg
+    -  distribute-0.6.19-py2.3.egg
     -  zc.buildout-1.0-py2.3.egg
 
 We see that we got an egg for demo that met the requirement, as well
@@ -264,7 +264,7 @@
     >>> ls(sample_buildout, 'eggs')
     -  demo-0.2-py2.3.egg
     -  demoneeded-1.2c1-py2.3.egg
-    -  setuptools-0.6-py2.3.egg
+    -  distribute-0.6.19-py2.3.egg
     -  zc.buildout-1.0-py2.3.egg
 
 If we run the buildout on the default online and newest modes,
@@ -282,7 +282,7 @@
     -  demo-0.2-py2.3.egg
     -  demo-0.4c1-py2.3.egg
     -  demoneeded-1.2c1-py2.3.egg
-    -  setuptools-0.6-py2.4.egg
+    -  distribute-0.6.19-py2.3.egg
     -  zc.buildout-1.0-py2.4.egg
 
 The script is updated too:

Modified: zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/api.txt
===================================================================
--- zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/api.txt	2011-06-15 05:39:48 UTC (rev 121938)
+++ zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/api.txt	2011-06-15 05:40:52 UTC (rev 121939)
@@ -104,7 +104,7 @@
     __buildout_installed__ =
     __buildout_signature__ = sample-6aWMvV2EJ9Ijq+bR8ugArQ==
             zc.recipe.egg-cAsnudgkduAa/Fd+WJIM6Q==
-            setuptools-0.6-py2.4.egg
+            distribute-0.6.19-py2.4.egg
             zc.buildout-+rYeCcmFuD1K/aB77XTj5A==
     _b = /sample-buildout/bin
     _d = /sample-buildout/develop-eggs

Modified: zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/egg.py
===================================================================
--- zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/egg.py	2011-06-15 05:39:48 UTC (rev 121938)
+++ zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/egg.py	2011-06-15 05:40:52 UTC (rev 121939)
@@ -167,11 +167,11 @@
 
             if options.query_bool('dependent-scripts', 'false'):
                 # Generate scripts for all packages in the working set,
-                # except setuptools.
+                # except distribute.
                 reqs = list(reqs)
                 for dist in ws:
                     name = dist.project_name
-                    if name != 'setuptools' and name not in reqs:
+                    if name != 'distribute' and name not in reqs:
                         reqs.append(name)
             return self._install(reqs, ws, scripts)
         return ()

Modified: zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/tests.py
===================================================================
--- zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2011-06-15 05:39:48 UTC (rev 121938)
+++ zc.buildout/branches/2/zc.recipe.egg_/src/zc/recipe/egg/tests.py	2011-06-15 05:40:52 UTC (rev 121939)
@@ -80,8 +80,8 @@
                 zc.buildout.tests.hide_distribute_additions,
                 (re.compile('zc.buildout(-\S+)?[.]egg(-link)?'),
                  'zc.buildout.egg'),
-                (re.compile('[-d]  (setuptools|distribute)-[^-]+-'),
-                 'setuptools-X-'),
+                (re.compile('[-d]  distribute-[^-]+-'),
+                 'distribute-X-'),
                 (re.compile(r'eggs\\\\demo'), 'eggs/demo'),
                 (re.compile(r'[a-zA-Z]:\\\\foo\\\\bar'), '/foo/bar'),
                 # Distribute unzips eggs by default.
@@ -98,7 +98,7 @@
                 (re.compile('__buildout_signature__ = '
                             'sample-\S+\s+'
                             'zc.recipe.egg-\S+\s+'
-                            '(setuptools|distribute)-\S+\s+'
+                            'distribute-\S+\s+'
                             'zc.buildout-\S+\s*'
                             ),
                  '__buildout_signature__ = sample- zc.recipe.egg-\n'),