[Checkins] SVN: grokproject/trunk/ update bootstrap.py for the grokproject buildout *and* project template to keep zc.buildout <2.0dev
Jan Wijbrand Kolman
cvs-admin at zope.org
Thu Feb 14 12:03:48 UTC 2013
Log message for revision 129399:
update bootstrap.py for the grokproject buildout *and* project template to keep zc.buildout <2.0dev
Changed:
U grokproject/trunk/CHANGES.txt
U grokproject/trunk/bootstrap.py
U grokproject/trunk/grokproject/template/bootstrap.py
-=-
Modified: grokproject/trunk/CHANGES.txt
===================================================================
--- grokproject/trunk/CHANGES.txt 2013-02-14 11:35:30 UTC (rev 129398)
+++ grokproject/trunk/CHANGES.txt 2013-02-14 12:03:48 UTC (rev 129399)
@@ -4,9 +4,9 @@
2.8 (unreleased)
----------------
-- Nothing changed yet.
+- Update bootstrap.py (for both the grokproject buildout *and* the project
+ template) to use zc.buildout <2.0dev.
-
2.7 (2012-05-02)
----------------
Modified: grokproject/trunk/bootstrap.py
===================================================================
--- grokproject/trunk/bootstrap.py 2013-02-14 11:35:30 UTC (rev 129398)
+++ grokproject/trunk/bootstrap.py 2013-02-14 12:03:48 UTC (rev 129399)
@@ -18,13 +18,13 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+import os, shutil, sys, tempfile, urllib, urllib2, subprocess
from optparse import OptionParser
if sys.platform == 'win32':
def quote(c):
if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
+ return '"%s"' % c # work around spawn lamosity on windows
else:
return c
else:
@@ -57,13 +57,13 @@
# out any namespace packages from site-packages that might have been
# loaded by .pth files.
clean_path = sys.path[:]
-import site
+import site # imported because of its side effects
sys.path[:] = clean_path
for k, v in sys.modules.items():
if k in ('setuptools', 'pkg_resources') or (
hasattr(v, '__path__') and
- len(v.__path__)==1 and
- not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ len(v.__path__) == 1 and
+ not os.path.exists(os.path.join(v.__path__[0], '__init__.py'))):
# This is a namespace package. Remove it.
sys.modules.pop(k)
@@ -72,10 +72,11 @@
setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
# parsing arguments
def normalize_to_url(option, opt_str, value, parser):
if value:
- if '://' not in value: # It doesn't smell like a URL.
+ if '://' not in value: # It doesn't smell like a URL.
value = 'file://%s' % (
urllib.pathname2url(
os.path.abspath(os.path.expanduser(value))),)
@@ -110,7 +111,7 @@
help=("Specify a URL or file location for the setup file. "
"If you use Setuptools, this will default to " +
setuptools_source + "; if you use Distribute, this "
- "will default to " + distribute_source +"."))
+ "will default to " + distribute_source + "."))
parser.add_option("--download-base", action="callback", dest="download_base",
callback=normalize_to_url, nargs=1, type="string",
help=("Specify a URL or directory for downloading "
@@ -135,10 +136,6 @@
options, args = parser.parse_args()
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
- args += ['-c', options.config_file]
-
if options.eggs:
eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
else:
@@ -151,12 +148,11 @@
options.setup_source = setuptools_source
if options.accept_buildout_test_releases:
- args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
+ args.insert(0, 'buildout:accept-buildout-test-releases=true')
try:
import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
if not hasattr(pkg_resources, '_distribute'):
raise ImportError
except ImportError:
@@ -169,6 +165,8 @@
setup_args['download_base'] = options.download_base
if options.use_distribute:
setup_args['no_fake'] = True
+ if sys.version_info[:2] == (2, 4):
+ setup_args['version'] = '0.6.32'
ez['use_setuptools'](**setup_args)
if 'pkg_resources' in sys.modules:
reload(sys.modules['pkg_resources'])
@@ -191,6 +189,8 @@
find_links = options.download_base
if not find_links:
find_links = os.environ.get('bootstrap-testing-find-links')
+if not find_links and options.accept_buildout_test_releases:
+ find_links = 'http://downloads.buildout.org/'
if find_links:
cmd.extend(['-f', quote(find_links)])
@@ -211,6 +211,7 @@
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
_final_parts = '*final-', '*final'
+
def _final_version(parsed_version):
for part in parsed_version:
if (part[:1] == '*') and (part not in _final_parts):
@@ -226,6 +227,8 @@
bestv = None
for dist in index[req.project_name]:
distv = dist.parsed_version
+ if distv >= pkg_resources.parse_version('2dev'):
+ continue
if _final_version(distv):
if bestv is None or distv > bestv:
best = [dist]
@@ -235,14 +238,18 @@
if best:
best.sort()
version = best[-1].version
+
if version:
- requirement = '=='.join((requirement, version))
+ requirement += '=='+version
+else:
+ requirement += '<2dev'
+
cmd.append(requirement)
if is_jython:
import subprocess
exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
if exitcode != 0:
sys.stdout.flush()
@@ -255,6 +262,16 @@
ws.add_entry(eggs_dir)
ws.require(requirement)
import zc.buildout.buildout
+
+# If there isn't already a command in the args, add bootstrap
+if not [a for a in args if '=' not in a]:
+ args.append('bootstrap')
+
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args[0:0] = ['-c', options.config_file]
+
zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
+if not options.eggs: # clean up temporary egg directory
shutil.rmtree(eggs_dir)
Modified: grokproject/trunk/grokproject/template/bootstrap.py
===================================================================
--- grokproject/trunk/grokproject/template/bootstrap.py 2013-02-14 11:35:30 UTC (rev 129398)
+++ grokproject/trunk/grokproject/template/bootstrap.py 2013-02-14 12:03:48 UTC (rev 129399)
@@ -18,13 +18,13 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+import os, shutil, sys, tempfile, urllib, urllib2, subprocess
from optparse import OptionParser
if sys.platform == 'win32':
def quote(c):
if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
+ return '"%s"' % c # work around spawn lamosity on windows
else:
return c
else:
@@ -46,33 +46,24 @@
# run without site-packages loaded. This is somewhat tricky, in
# particular because Python 2.6's distutils imports site, so starting
# with the -S flag is not sufficient. However, we'll start with that:
-
-# XXX There is a difference between 'stock' zc.buildout bootstrap.py and this
-# bootstrap.py.
-# This is a hack around restarting the bootstrap run in order not to restart
-# with '-S', as this raises problems when ran from a virtualenv. As soon as
-# virtualenv and -S play nice again, revert this hack.
-# https://bugs.launchpad.net/virtualenv/+bug/572545
-
-# if not has_broken_dash_S and 'site' in sys.modules:
-# # We will restart with python -S.
-# args = sys.argv[:]
-# args[0:0] = [sys.executable, '-S']
-# args = map(quote, args)
-# os.execv(sys.executable, args)
-
+if not has_broken_dash_S and 'site' in sys.modules:
+ # We will restart with python -S.
+ args = sys.argv[:]
+ args[0:0] = [sys.executable, '-S']
+ args = map(quote, args)
+ os.execv(sys.executable, args)
# Now we are running with -S. We'll get the clean sys.path, import site
# because distutils will do it later, and then reset the path and clean
# out any namespace packages from site-packages that might have been
# loaded by .pth files.
clean_path = sys.path[:]
-import site
+import site # imported because of its side effects
sys.path[:] = clean_path
for k, v in sys.modules.items():
if k in ('setuptools', 'pkg_resources') or (
hasattr(v, '__path__') and
- len(v.__path__)==1 and
- not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))):
+ len(v.__path__) == 1 and
+ not os.path.exists(os.path.join(v.__path__[0], '__init__.py'))):
# This is a namespace package. Remove it.
sys.modules.pop(k)
@@ -81,10 +72,11 @@
setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py'
distribute_source = 'http://python-distribute.org/distribute_setup.py'
+
# parsing arguments
def normalize_to_url(option, opt_str, value, parser):
if value:
- if '://' not in value: # It doesn't smell like a URL.
+ if '://' not in value: # It doesn't smell like a URL.
value = 'file://%s' % (
urllib.pathname2url(
os.path.abspath(os.path.expanduser(value))),)
@@ -119,7 +111,7 @@
help=("Specify a URL or file location for the setup file. "
"If you use Setuptools, this will default to " +
setuptools_source + "; if you use Distribute, this "
- "will default to " + distribute_source +"."))
+ "will default to " + distribute_source + "."))
parser.add_option("--download-base", action="callback", dest="download_base",
callback=normalize_to_url, nargs=1, type="string",
help=("Specify a URL or directory for downloading "
@@ -144,10 +136,6 @@
options, args = parser.parse_args()
-# if -c was provided, we push it back into args for buildout's main function
-if options.config_file is not None:
- args += ['-c', options.config_file]
-
if options.eggs:
eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
else:
@@ -160,12 +148,11 @@
options.setup_source = setuptools_source
if options.accept_buildout_test_releases:
- args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
+ args.insert(0, 'buildout:accept-buildout-test-releases=true')
try:
import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ import setuptools # A flag. Sometimes pkg_resources is installed alone.
if not hasattr(pkg_resources, '_distribute'):
raise ImportError
except ImportError:
@@ -178,6 +165,8 @@
setup_args['download_base'] = options.download_base
if options.use_distribute:
setup_args['no_fake'] = True
+ if sys.version_info[:2] == (2, 4):
+ setup_args['version'] = '0.6.32'
ez['use_setuptools'](**setup_args)
if 'pkg_resources' in sys.modules:
reload(sys.modules['pkg_resources'])
@@ -200,6 +189,8 @@
find_links = options.download_base
if not find_links:
find_links = os.environ.get('bootstrap-testing-find-links')
+if not find_links and options.accept_buildout_test_releases:
+ find_links = 'http://downloads.buildout.org/'
if find_links:
cmd.extend(['-f', quote(find_links)])
@@ -220,6 +211,7 @@
# Figure out the most recent final version of zc.buildout.
import setuptools.package_index
_final_parts = '*final-', '*final'
+
def _final_version(parsed_version):
for part in parsed_version:
if (part[:1] == '*') and (part not in _final_parts):
@@ -235,6 +227,8 @@
bestv = None
for dist in index[req.project_name]:
distv = dist.parsed_version
+ if distv >= pkg_resources.parse_version('2dev'):
+ continue
if _final_version(distv):
if bestv is None or distv > bestv:
best = [dist]
@@ -244,14 +238,18 @@
if best:
best.sort()
version = best[-1].version
+
if version:
- requirement = '=='.join((requirement, version))
+ requirement += '=='+version
+else:
+ requirement += '<2dev'
+
cmd.append(requirement)
if is_jython:
import subprocess
exitcode = subprocess.Popen(cmd, env=env).wait()
-else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
if exitcode != 0:
sys.stdout.flush()
@@ -264,6 +262,16 @@
ws.add_entry(eggs_dir)
ws.require(requirement)
import zc.buildout.buildout
+
+# If there isn't already a command in the args, add bootstrap
+if not [a for a in args if '=' not in a]:
+ args.append('bootstrap')
+
+
+# if -c was provided, we push it back into args for buildout's main function
+if options.config_file is not None:
+ args[0:0] = ['-c', options.config_file]
+
zc.buildout.buildout.main(args)
-if not options.eggs: # clean up temporary egg directory
+if not options.eggs: # clean up temporary egg directory
shutil.rmtree(eggs_dir)
More information about the checkins
mailing list