[Checkins] SVN: zc.buildout/trunk/ initial changes pending testing when a distribute egg is released

Chris Withers chris at simplistix.co.uk
Thu Aug 6 10:45:18 EDT 2009


Log message for revision 102544:
  initial changes pending testing when a distribute egg is released
  

Changed:
  U   zc.buildout/trunk/bootstrap/bootstrap.py
  U   zc.buildout/trunk/dev.py
  U   zc.buildout/trunk/setup.py
  U   zc.buildout/trunk/zc.recipe.egg_/setup.py

-=-
Modified: zc.buildout/trunk/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/trunk/bootstrap/bootstrap.py	2009-08-06 14:44:22 UTC (rev 102543)
+++ zc.buildout/trunk/bootstrap/bootstrap.py	2009-08-06 14:45:18 UTC (rev 102544)
@@ -26,16 +26,22 @@
 
 is_jython = sys.platform.startswith('java')
 
+to_reload = False
 try:
     import pkg_resources
+    if not hasattr(pkg_resources, '_distribute'):
+        to_reload = True
+        raise ImportError
 except ImportError:
     ez = {}
-    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+    exec urllib2.urlopen('http://nightly.ziade.org/bootstraping.py'
                          ).read() in ez
     ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+    if to_reload:
+        reload(pkg_resources)
+    else:
+        import pkg_resources
 
-    import pkg_resources
-
 if sys.platform == 'win32':
     def quote(c):
         if ' ' in c:
@@ -63,7 +69,7 @@
            quote(tmpeggs), 'zc.buildout' + VERSION],
            env=dict(os.environ,
                PYTHONPATH=
-               ws.find(pkg_resources.Requirement.parse('setuptools')).location
+               ws.find(pkg_resources.Requirement.parse('distribute')).location
                ),
            ).wait() == 0
 
@@ -73,7 +79,7 @@
         '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
         dict(os.environ,
             PYTHONPATH=
-            ws.find(pkg_resources.Requirement.parse('setuptools')).location
+            ws.find(pkg_resources.Requirement.parse('distribute')).location
             ),
         ) == 0
 

Modified: zc.buildout/trunk/dev.py
===================================================================
--- zc.buildout/trunk/dev.py	2009-08-06 14:44:22 UTC (rev 102543)
+++ zc.buildout/trunk/dev.py	2009-08-06 14:45:18 UTC (rev 102544)
@@ -30,15 +30,22 @@
 if os.path.isdir('build'):
     shutil.rmtree('build')
 
+to_reload = False
 try:
     import pkg_resources
+    if not hasattr(pkg_resources, '_distribute'):
+        to_reload = True
+        raise ImportError
 except ImportError:
     ez = {}
-    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+    exec urllib2.urlopen('http://nightly.ziade.org/bootstraping.py'
                          ).read() in ez
-    ez['use_setuptools'](to_dir='eggs', download_delay=0)
+    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+    if to_reload:
+        reload(pkg_resources)
+    else:
+        import pkg_resources
 
-    import pkg_resources
 
 subprocess.Popen(
     [sys.executable] +

Modified: zc.buildout/trunk/setup.py
===================================================================
--- zc.buildout/trunk/setup.py	2009-08-06 14:44:22 UTC (rev 102543)
+++ zc.buildout/trunk/setup.py	2009-08-06 14:45:18 UTC (rev 102544)
@@ -72,7 +72,7 @@
     packages = ['zc', 'zc.buildout'],
     package_dir = {'': 'src'},
     namespace_packages = ['zc'],
-    install_requires = 'setuptools',
+    install_requires = 'distribute',
     include_package_data = True,
     entry_points = {'console_scripts':
                     ['buildout = %s.buildout:main' % name]}, 

Modified: zc.buildout/trunk/zc.recipe.egg_/setup.py
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/setup.py	2009-08-06 14:44:22 UTC (rev 102543)
+++ zc.buildout/trunk/zc.recipe.egg_/setup.py	2009-08-06 14:45:18 UTC (rev 102544)
@@ -67,7 +67,7 @@
     namespace_packages = ['zc', 'zc.recipe'],
     install_requires = [
         'zc.buildout >=1.2.0',
-        'setuptools'],
+        'distribute'],
     tests_require = ['zope.testing'],
     test_suite = name+'.tests.test_suite',
     entry_points = {'zc.buildout': ['default = %s:Scripts' % name,



More information about the Checkins mailing list