[Checkins] SVN: zc.buildout/trunk/ added the distribute option to the bootstrap script
Tarek Ziade
ziade.tarek at gmail.com
Fri Oct 23 05:23:37 EDT 2009
Log message for revision 105232:
added the distribute option to the bootstrap script
Changed:
U zc.buildout/trunk/bootstrap/bootstrap.py
U zc.buildout/trunk/buildout.cfg
U zc.buildout/trunk/src/zc/buildout/bootstrap.txt
-=-
Modified: zc.buildout/trunk/bootstrap/bootstrap.py
===================================================================
--- zc.buildout/trunk/bootstrap/bootstrap.py 2009-10-23 08:12:04 UTC (rev 105231)
+++ zc.buildout/trunk/bootstrap/bootstrap.py 2009-10-23 09:23:37 UTC (rev 105232)
@@ -21,20 +21,51 @@
"""
import os, shutil, sys, tempfile, urllib2
+from optparse import OptionParser
tmpeggs = tempfile.mkdtemp()
is_jython = sys.platform.startswith('java')
+# 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 Disribute rather than Setuptools.")
+
+options, args = parser.parse_args()
+
+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):
@@ -49,12 +80,10 @@
cmd = 'from setuptools.command.easy_install import main; main()'
ws = pkg_resources.working_set
-if len(sys.argv) > 2 and sys.argv[1] == '--version':
- VERSION = '==%s' % sys.argv[2]
- args = sys.argv[3:] + ['bootstrap']
+if USE_DISTRIBUTE:
+ requirement = 'distribute'
else:
- VERSION = ''
- args = sys.argv[1:] + ['bootstrap']
+ requirement = 'setuptools'
if is_jython:
import subprocess
@@ -63,7 +92,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(requirement)).location
),
).wait() == 0
@@ -73,7 +102,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(requirement)).location
),
) == 0
Modified: zc.buildout/trunk/buildout.cfg
===================================================================
--- zc.buildout/trunk/buildout.cfg 2009-10-23 08:12:04 UTC (rev 105231)
+++ zc.buildout/trunk/buildout.cfg 2009-10-23 09:23:37 UTC (rev 105232)
@@ -25,3 +25,13 @@
'-t',
'!(bootstrap|selectingpython|selecting-python)',
]
+
+[python2.4]
+executable = python2.4
+
+[python2.5]
+executable = python2.5
+
+[python2.6]
+executable = python2.6
+
Modified: zc.buildout/trunk/src/zc/buildout/bootstrap.txt
===================================================================
--- zc.buildout/trunk/src/zc/buildout/bootstrap.txt 2009-10-23 08:12:04 UTC (rev 105231)
+++ zc.buildout/trunk/src/zc/buildout/bootstrap.txt 2009-10-23 09:23:37 UTC (rev 105232)
@@ -58,7 +58,6 @@
...
X
No local packages or download links found for zc.buildout==UNKNOWN
- error: Could not find suitable distribution for Requirement.parse('zc.buildout==UNKNOWN')
...
Now let's try with `1.1.2`, which happens to exist::
@@ -120,4 +119,62 @@
zc.buildout.buildout.main()
<BLANKLINE>
+`zc.buildout` now can also run with `Distribute` with the `--distribute` option::
+
+ >>> print 'X'; print system(
+ ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
+ ... 'bootstrap.py --distribute'); print 'X' # doctest: +ELLIPSIS
+ ...
+ X
+ ...
+ Generated script '/sample/bin/buildout'.
+ <BLANKLINE>
+ X
+
+Let's make sure the generated `buildout` script uses it::
+
+ >>> print open(buildout_script).read() # doctest: +ELLIPSIS
+ #...
+ <BLANKLINE>
+ import sys
+ sys.path[0:0] = [
+ '/sample/eggs/distribute-...egg',
+ '/sample/eggs/zc.buildout-...egg',
+ ]
+ <BLANKLINE>
+ import zc.buildout.buildout
+ <BLANKLINE>
+ if __name__ == '__main__':
+ zc.buildout.buildout.main()
+ <BLANKLINE>
+
+Make sure both options can be used together::
+
+ >>> print 'X'; print system(
+ ... zc.buildout.easy_install._safe_arg(sys.executable)+' '+
+ ... 'bootstrap.py --distribute --version 1.2.1'); print 'X' # doctest: +ELLIPSIS
+ ...
+ X
+ ...
+ Generated script '/sample/bin/buildout'.
+ <BLANKLINE>
+ X
+
+Let's make sure the generated `buildout` script uses ``Distribute`` *and* ``zc.buildout-1.2.1``::
+
+ >>> print open(buildout_script).read() # doctest: +ELLIPSIS
+ #...
+ <BLANKLINE>
+ import sys
+ sys.path[0:0] = [
+ '/sample/eggs/distribute-...egg',
+ '/sample/eggs/zc.buildout-1.2.1...egg',
+ ]
+ <BLANKLINE>
+ import zc.buildout.buildout
+ <BLANKLINE>
+ if __name__ == '__main__':
+ zc.buildout.buildout.main()
+ <BLANKLINE>
+
More information about the checkins
mailing list