Commit 664186db authored by Tres Seaver's avatar Tres Seaver

Merge pull request #17 from zopefoundation/update-setuptools-buildout-2.13

Update setuptools and zc.buildout to currently-installable versions.
parents ccc90d17 a6c876f6
...@@ -18,75 +18,14 @@ The script accepts buildout command-line options, so you can ...@@ -18,75 +18,14 @@ The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file. use the -c option to specify an alternate configuration file.
""" """
import os, shutil, sys, tempfile, urllib, urllib2, subprocess import os
import shutil
import sys
import tempfile
from optparse import OptionParser from optparse import OptionParser
if sys.platform == 'win32': tmpeggs = tempfile.mkdtemp()
def quote(c):
if ' ' in c:
return '"%s"' % c # work around spawn lamosity on windows
else:
return c
else:
quote = str
# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments.
stdout, stderr = subprocess.Popen(
[sys.executable, '-Sc',
'try:\n'
' import ConfigParser\n'
'except ImportError:\n'
' print 1\n'
'else:\n'
' print 0\n'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
has_broken_dash_S = bool(int(stdout.strip()))
# In order to be more robust in the face of system Pythons, we want to
# 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:
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 # 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'))):
# This is a namespace package. Remove it.
sys.modules.pop(k)
is_jython = sys.platform.startswith('java')
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.
value = 'file://%s' % (
urllib.pathname2url(
os.path.abspath(os.path.expanduser(value))),)
if opt_str == '--download-base' and not value.endswith('/'):
# Download base needs a trailing slash to make the world happy.
value += '/'
else:
value = None
name = opt_str[2:].replace('-', '_')
setattr(parser.values, name, value)
usage = '''\ usage = '''\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
...@@ -96,31 +35,13 @@ Bootstraps a buildout-based project. ...@@ -96,31 +35,13 @@ Bootstraps a buildout-based project.
Simply run this script in a directory containing a buildout.cfg, using the Simply run this script in a directory containing a buildout.cfg, using the
Python that you want bin/buildout to use. Python that you want bin/buildout to use.
Note that by using --setup-source and --download-base to point to Note that by using --find-links to point to local resources, you can keep
local resources, you can keep this script from going over the network. this script from going over the network.
''' '''
parser = OptionParser(usage=usage) parser = OptionParser(usage=usage)
parser.add_option("-v", "--version", dest="version", parser.add_option("-v", "--version", help="use a specific zc.buildout version")
help="use a specific zc.buildout version")
parser.add_option("-d", "--distribute",
action="store_true", dest="use_distribute", default=False,
help="Use Distribute rather than Setuptools.")
parser.add_option("--setup-source", action="callback", dest="setup_source",
callback=normalize_to_url, nargs=1, type="string",
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 + "."))
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 "
"zc.buildout and either Setuptools or Distribute. "
"Defaults to PyPI."))
parser.add_option("--eggs",
help=("Specify a directory for storing eggs. Defaults to "
"a temporary directory that is deleted when the "
"bootstrap script completes."))
parser.add_option("-t", "--accept-buildout-test-releases", parser.add_option("-t", "--accept-buildout-test-releases",
dest='accept_buildout_test_releases', dest='accept_buildout_test_releases',
action="store_true", default=False, action="store_true", default=False,
...@@ -130,80 +51,80 @@ parser.add_option("-t", "--accept-buildout-test-releases", ...@@ -130,80 +51,80 @@ parser.add_option("-t", "--accept-buildout-test-releases",
"extensions for you. If you use this flag, " "extensions for you. If you use this flag, "
"bootstrap and buildout will get the newest releases " "bootstrap and buildout will get the newest releases "
"even if they are alphas or betas.")) "even if they are alphas or betas."))
parser.add_option("-c", None, action="store", dest="config_file", parser.add_option("-c", "--config-file",
help=("Specify the path to the buildout configuration " help=("Specify the path to the buildout configuration "
"file to be used.")) "file to be used."))
parser.add_option("-f", "--find-links",
options, args = parser.parse_args() help=("Specify a URL to search for buildout releases"))
parser.add_option("--allow-site-packages",
action="store_true", default=False,
help=("Let bootstrap.py use existing site packages"))
parser.add_option("--setuptools-version",
help="use a specific setuptools version")
if options.eggs:
eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
else:
eggs_dir = tempfile.mkdtemp()
if options.setup_source is None: options, args = parser.parse_args()
if options.use_distribute:
options.setup_source = distribute_source
else:
options.setup_source = setuptools_source
if options.accept_buildout_test_releases: ######################################################################
args.insert(0, 'buildout:accept-buildout-test-releases=true') # load/install setuptools
try: try:
import pkg_resources if options.allow_site_packages:
import setuptools # A flag. Sometimes pkg_resources is installed alone. import setuptools
if not hasattr(pkg_resources, '_distribute'): import pkg_resources
raise ImportError from urllib.request import urlopen
except ImportError: except ImportError:
ez_code = urllib2.urlopen( from urllib2 import urlopen
options.setup_source).read().replace('\r\n', '\n')
ez = {} ez = {}
exec ez_code in ez exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
setup_args = dict(to_dir=eggs_dir, download_delay=0)
if options.download_base: if not options.allow_site_packages:
setup_args['download_base'] = options.download_base # ez_setup imports site, which adds site packages
if options.use_distribute: # this will remove them from the path to ensure that incompatible versions
setup_args['no_fake'] = True # of setuptools are not in the path
if sys.version_info[:2] == (2, 4): import site
setup_args['version'] = '0.6.32' # inside a virtualenv, there is no 'getsitepackages'.
ez['use_setuptools'](**setup_args) # We can't remove these reliably
if 'pkg_resources' in sys.modules: if hasattr(site, 'getsitepackages'):
reload(sys.modules['pkg_resources']) for sitepackage_path in site.getsitepackages():
import pkg_resources sys.path[:] = [x for x in sys.path if sitepackage_path not in x]
# This does not (always?) update the default working set. We will
# do it. setup_args = dict(to_dir=tmpeggs, download_delay=0)
for path in sys.path:
if path not in pkg_resources.working_set.entries: if options.setuptools_version is not None:
pkg_resources.working_set.add_entry(path) setup_args['version'] = options.setuptools_version
cmd = [quote(sys.executable), ez['use_setuptools'](**setup_args)
'-c', import setuptools
quote('from setuptools.command.easy_install import main; main()'), import pkg_resources
'-mqNxd',
quote(eggs_dir)] # This does not (always?) update the default working set. We will
# do it.
if not has_broken_dash_S: for path in sys.path:
cmd.insert(1, '-S') if path not in pkg_resources.working_set.entries:
pkg_resources.working_set.add_entry(path)
find_links = options.download_base
if not find_links: ######################################################################
find_links = os.environ.get('bootstrap-testing-find-links') # Install buildout
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)])
if options.use_distribute:
setup_requirement = 'distribute'
else:
setup_requirement = 'setuptools'
ws = pkg_resources.working_set ws = pkg_resources.working_set
setup_requirement_path = ws.find(
pkg_resources.Requirement.parse(setup_requirement)).location cmd = [sys.executable, '-c',
env = dict( 'from setuptools.command.easy_install import main; main()',
os.environ, '-mZqNxd', tmpeggs]
PYTHONPATH=setup_requirement_path)
find_links = os.environ.get(
'bootstrap-testing-find-links',
options.find_links or
('http://downloads.buildout.org/'
if options.accept_buildout_test_releases else None)
)
if find_links:
cmd.extend(['-f', find_links])
setuptools_path = ws.find(
pkg_resources.Requirement.parse('setuptools')).location
requirement = 'zc.buildout' requirement = 'zc.buildout'
version = options.version version = options.version
...@@ -213,12 +134,17 @@ if version is None and not options.accept_buildout_test_releases: ...@@ -213,12 +134,17 @@ if version is None and not options.accept_buildout_test_releases:
_final_parts = '*final-', '*final' _final_parts = '*final-', '*final'
def _final_version(parsed_version): def _final_version(parsed_version):
for part in parsed_version: try:
if (part[:1] == '*') and (part not in _final_parts): return not parsed_version.is_prerelease
return False except AttributeError:
return True # Older setuptools
for part in parsed_version:
if (part[:1] == '*') and (part not in _final_parts):
return False
return True
index = setuptools.package_index.PackageIndex( index = setuptools.package_index.PackageIndex(
search_path=[setup_requirement_path]) search_path=[setuptools_path])
if find_links: if find_links:
index.add_find_links((find_links,)) index.add_find_links((find_links,))
req = pkg_resources.Requirement.parse(requirement) req = pkg_resources.Requirement.parse(requirement)
...@@ -227,8 +153,6 @@ if version is None and not options.accept_buildout_test_releases: ...@@ -227,8 +153,6 @@ if version is None and not options.accept_buildout_test_releases:
bestv = None bestv = None
for dist in index[req.project_name]: for dist in index[req.project_name]:
distv = dist.parsed_version distv = dist.parsed_version
if distv >= pkg_resources.parse_version('2dev'):
continue
if _final_version(distv): if _final_version(distv):
if bestv is None or distv > bestv: if bestv is None or distv > bestv:
best = [dist] best = [dist]
...@@ -238,40 +162,28 @@ if version is None and not options.accept_buildout_test_releases: ...@@ -238,40 +162,28 @@ if version is None and not options.accept_buildout_test_releases:
if best: if best:
best.sort() best.sort()
version = best[-1].version version = best[-1].version
if version: if version:
requirement += '=='+version requirement = '=='.join((requirement, version))
else:
requirement += '<2dev'
cmd.append(requirement) cmd.append(requirement)
if is_jython: import subprocess
import subprocess if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=setuptools_path)) != 0:
exitcode = subprocess.Popen(cmd, env=env).wait() raise Exception(
else: # Windows prefers this, apparently; otherwise we would prefer subprocess "Failed to execute command:\n%s" % repr(cmd)[1:-1])
exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
if exitcode != 0: ######################################################################
sys.stdout.flush() # Import and run buildout
sys.stderr.flush()
print ("An error occurred when trying to install zc.buildout. " ws.add_entry(tmpeggs)
"Look above this message for any errors that "
"were output by easy_install.")
sys.exit(exitcode)
ws.add_entry(eggs_dir)
ws.require(requirement) ws.require(requirement)
import zc.buildout.buildout 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]: if not [a for a in args if '=' not in a]:
args.append('bootstrap') args.append('bootstrap')
# if -c was provided, we push it back into args for buildout' main function
# if -c was provided, we push it back into args for buildout's main function
if options.config_file is not None: if options.config_file is not None:
args[0:0] = ['-c', options.config_file] args[0:0] = ['-c', options.config_file]
zc.buildout.buildout.main(args) zc.buildout.buildout.main(args)
if not options.eggs: # clean up temporary egg directory shutil.rmtree(tmpeggs)
shutil.rmtree(eggs_dir)
...@@ -23,7 +23,7 @@ if sys.platform[:3].lower() == "win": ...@@ -23,7 +23,7 @@ if sys.platform[:3].lower() == "win":
setup(name='Zope2', setup(name='Zope2',
version='2.13.23dev', version='2.13.23.dev0',
url='http://zope2.zope.org', url='http://zope2.zope.org',
license='ZPL 2.1', license='ZPL 2.1',
description='Zope2 application server / web framework', description='Zope2 application server / web framework',
......
...@@ -22,7 +22,7 @@ zope.datetime = 3.4.1 ...@@ -22,7 +22,7 @@ zope.datetime = 3.4.1
zope.deferredimport = 3.5.3 zope.deferredimport = 3.5.3
zope.deprecation = 3.4.1 zope.deprecation = 3.4.1
zope.dottedname = 3.4.6 zope.dottedname = 3.4.6
zope.dublincore = 3.7.0 zope.dublincore = 3.7.1
zope.error = 3.7.4 zope.error = 3.7.4
zope.event = 3.5.2 zope.event = 3.5.2
zope.exceptions = 3.6.2 zope.exceptions = 3.6.2
...@@ -72,7 +72,7 @@ zope.documenttemplate = 3.4.3 ...@@ -72,7 +72,7 @@ zope.documenttemplate = 3.4.3
# Dependencies # Dependencies
# Needed for the mechanize 0.1.x. # Needed for the mechanize 0.1.x.
ClientForm = 0.2.10 ClientForm = 0.2.10
distribute = 0.6.36 distribute = 0.6.49
docutils = 0.7 docutils = 0.7
Jinja2 = 2.5.5 Jinja2 = 2.5.5
# Newer versions of mechanize are not fully py24 compatible. # Newer versions of mechanize are not fully py24 compatible.
...@@ -85,12 +85,12 @@ Pygments = 1.3.1 ...@@ -85,12 +85,12 @@ Pygments = 1.3.1
python-gettext = 1.0 python-gettext = 1.0
pytz = 2013b pytz = 2013b
RestrictedPython = 3.6.0 RestrictedPython = 3.6.0
setuptools = 0.6c11 setuptools = 12.0.5
Sphinx = 1.0.8 Sphinx = 1.0.8
transaction = 1.1.1 transaction = 1.1.1
unittest2 = 0.5.1 unittest2 = 0.5.1
z3c.recipe.sphinxdoc = 0.0.8 z3c.recipe.sphinxdoc = 0.0.8
zc.buildout = 1.7.1 zc.buildout = 2.3.1
zc.lockfile = 1.0.2 zc.lockfile = 1.0.2
ZConfig = 2.8.0 ZConfig = 2.8.0
zc.recipe.egg = 1.3.2 zc.recipe.egg = 1.3.2
...@@ -98,16 +98,16 @@ zc.recipe.testrunner = 1.2.1 ...@@ -98,16 +98,16 @@ zc.recipe.testrunner = 1.2.1
zc.resourcelibrary = 1.3.4 zc.resourcelibrary = 1.3.4
zdaemon = 2.0.7 zdaemon = 2.0.7
ZODB3 = 3.9.7 ZODB3 = 3.9.7
zope.mkzeoinstance = 3.9.5 zope.mkzeoinstance = 3.9.6
# toolchain # toolchain
argparse = 1.1 argparse = 1.1
coverage = 3.5.2 coverage = 3.5.3
lxml = 2.2.8 lxml = 2.2.8
mr.developer = 1.25 mr.developer = 1.25
tl.eggdeps = 0.4 tl.eggdeps = 0.4
nose = 1.1.2 nose = 1.1.2
z3c.checkversions = 0.4.1 z3c.checkversions = 0.4.2
z3c.recipe.compattest = 0.12.2 z3c.recipe.compattest = 0.12.2
z3c.recipe.depgraph = 0.5 z3c.recipe.depgraph = 0.5
zope.kgs = 1.2.0 zope.kgs = 1.2.0
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment