[Checkins] SVN: grokproject/trunk/grokproject/template/bootstrap.py Remove references to eggbasket.
Jan-Jaap Driessen
jdriessen at thehealthagency.com
Mon Apr 19 05:28:22 EDT 2010
Log message for revision 111071:
Remove references to eggbasket.
Use "standard" bootstrap file.
Changed:
U grokproject/trunk/grokproject/template/bootstrap.py
-=-
Modified: grokproject/trunk/grokproject/template/bootstrap.py
===================================================================
--- grokproject/trunk/grokproject/template/bootstrap.py 2010-04-19 09:27:47 UTC (rev 111070)
+++ grokproject/trunk/grokproject/template/bootstrap.py 2010-04-19 09:28:21 UTC (rev 111071)
@@ -17,34 +17,63 @@
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
-$Id: bootstrap.py 85041 2008-03-31 15:57:30Z andreasjung $
+$Id$
"""
-import os, shutil, sys, tempfile, urllib2, logging
+import os, shutil, sys, tempfile, urllib2
+from optparse import OptionParser
-def remove_old_logger_handlers():
- # zc.buildout installs a new log stream on every call of
- # main(). We remove any leftover handlers to avoid multiple output
- # of same content (doubled lines etc.)
- root_logger = logging.getLogger()
- if 'zc.buildout' in root_logger.manager.loggerDict.keys():
- logger = logging.getLogger('zc.buildout')
- for handler in logger.handlers:
- logger.removeHandler(handler)
- return
+tmpeggs = tempfile.mkdtemp()
+is_jython = sys.platform.startswith('java')
-tmpeggs = tempfile.mkdtemp()
+# parsing arguments
+parser = OptionParser()
+parser.add_option("-v", "--version", dest="version",
+ help="use a specific zc.buildout version")
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="distribute", default=False,
+ help="Use Distribute rather than Setuptools.")
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.version is not None:
+ VERSION = '==%s' % options.version
+else:
+ VERSION = ''
+
+USE_DISTRIBUTE = options.distribute
+args = args + ['bootstrap']
+
+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'
+ if USE_DISTRIBUTE:
+ exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
).read() in ez
- ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
+ else:
+ exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+ ).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
- import pkg_resources
+ if to_reload:
+ reload(pkg_resources)
+ else:
+ import pkg_resources
if sys.platform == 'win32':
def quote(c):
@@ -58,27 +87,35 @@
cmd = 'from setuptools.command.easy_install import main; main()'
ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, quote (sys.executable),
- '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+if USE_DISTRIBUTE:
+ requirement = 'distribute'
+else:
+ requirement = 'setuptools'
+
+if is_jython:
+ import subprocess
+
+ assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+ quote(tmpeggs), 'zc.buildout' + VERSION],
+ env=dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse(requirement)).location
+ ),
+ ).wait() == 0
+
+else:
+ assert os.spawnle(
+ os.P_WAIT, sys.executable, quote (sys.executable),
+ '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
+ dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse(requirement)).location
+ ),
+ ) == 0
+
ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+ws.require('zc.buildout' + VERSION)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
-remove_old_logger_handlers()
+zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
-
-# grokproject specific addition to standard bootstrap.py:
-# Install eggbasket too. This should be verbose to give the user
-# information about what is happening, since this can take a while.
-zc.buildout.buildout.main(sys.argv[1:] + ['-v', 'install', 'eggbasket'])
-if sys.platform == 'win32':
- print "Now you can run 'bin\buildout.exe'"
-else:
- print "Now you can run 'bin/buildout'"
More information about the checkins
mailing list