[Checkins] SVN: zc.buildout/branches/use_distribute/src/zc/buildout/ A couple more instances of setuptools -> distribute.

Chris Withers chris at simplistix.co.uk
Tue Sep 8 09:14:58 EDT 2009


Log message for revision 103643:
  A couple more instances of setuptools -> distribute.

Changed:
  U   zc.buildout/branches/use_distribute/src/zc/buildout/bootstrap.txt
  U   zc.buildout/branches/use_distribute/src/zc/buildout/testselectingpython.py

-=-
Modified: zc.buildout/branches/use_distribute/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/branches/use_distribute/src/zc/buildout/bootstrap.txt	2009-09-08 10:52:14 UTC (rev 103642)
+++ zc.buildout/branches/use_distribute/src/zc/buildout/bootstrap.txt	2009-09-08 13:14:57 UTC (rev 103643)
@@ -82,7 +82,7 @@
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      '/sample/eggs/setuptools-...egg',
+      '/sample/eggs/distribute-...egg',
       '/sample/eggs/zc.buildout-1.1.2...egg',
       ]
     <BLANKLINE>
@@ -110,7 +110,7 @@
     <BLANKLINE>
     import sys
     sys.path[0:0] = [
-      '/sample/eggs/setuptools-...egg',
+      '/sample/eggs/distribute-...egg',
       '/sample/eggs/zc.buildout-1.2.1...egg',
       ]
     <BLANKLINE>

Modified: zc.buildout/branches/use_distribute/src/zc/buildout/testselectingpython.py
===================================================================
--- zc.buildout/branches/use_distribute/src/zc/buildout/testselectingpython.py	2009-09-08 10:52:14 UTC (rev 103642)
+++ zc.buildout/branches/use_distribute/src/zc/buildout/testselectingpython.py	2009-09-08 13:14:57 UTC (rev 103643)
@@ -36,7 +36,7 @@
     >>> ls(dest)
     d  demo-0.3-py%(other_version)s.egg
     d  demoneeded-1.1-py%(other_version)s.egg
-    d  setuptools-0.6-py%(other_version)s.egg
+    d  distribute-0.6-py%(other_version)s.egg
 
 """ % dict(other_version=other_version)
     )
@@ -63,7 +63,7 @@
         setUp=setup,
         tearDown=zc.buildout.testing.buildoutTearDown,
         checker=renormalizing.RENormalizing([
-            (re.compile('setuptools-\S+-py%s.egg' % other_version),
-             'setuptools-V-py%s.egg' % other_version),
+            (re.compile('distribute-\S+-py%s.egg' % other_version),
+             'distribute-V-py%s.egg' % other_version),
             ]),
         )



More information about the checkins mailing list