[Checkins] SVN: z3c.recipe.compattest/trunk/ Depend on buildout 2 and zc.recipe.testrunner 2.
Hano Schlichting
cvs-admin at zope.org
Tue Feb 26 21:06:56 UTC 2013
Log message for revision 129863:
Depend on buildout 2 and zc.recipe.testrunner 2.
Changed:
U z3c.recipe.compattest/trunk/CHANGES.txt
U z3c.recipe.compattest/trunk/bootstrap.py
U z3c.recipe.compattest/trunk/buildout.cfg
U z3c.recipe.compattest/trunk/setup.py
U z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py
U z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.py
U z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.txt
U z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py
-=-
Modified: z3c.recipe.compattest/trunk/CHANGES.txt
===================================================================
--- z3c.recipe.compattest/trunk/CHANGES.txt 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/CHANGES.txt 2013-02-26 21:06:56 UTC (rev 129863)
@@ -2,10 +2,10 @@
CHANGES
=======
-0.14 (unreleased)
-=================
+1.0 (unreleased)
+================
-- Nothing changed yet.
+- Depend on buildout 2 and zc.recipe.testrunner 2.
0.13.1 (2010-12-17)
Modified: z3c.recipe.compattest/trunk/bootstrap.py
===================================================================
--- z3c.recipe.compattest/trunk/bootstrap.py 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/bootstrap.py 2013-02-26 21:06:56 UTC (rev 129863)
@@ -18,75 +18,11 @@
use the -c option to specify an alternate configuration file.
"""
-import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess
+import os, shutil, sys, tempfile
from optparse import OptionParser
-if sys.platform == 'win32':
- def quote(c):
- if ' ' in c:
- return '"%s"' % c # work around spawn lamosity on windows
- else:
- return c
-else:
- quote = str
+tmpeggs = tempfile.mkdtemp()
-# 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
-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 = '''\
[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -100,26 +36,8 @@
'''
parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", dest="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("-v", "--version", help="use a specific zc.buildout version")
+
parser.add_option("-t", "--accept-buildout-test-releases",
dest='accept_buildout_test_releases',
action="store_true", default=False,
@@ -129,49 +47,38 @@
"extensions for you. If you use this flag, "
"bootstrap and buildout will get the newest releases "
"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 "
"file to be used."))
+parser.add_option("-f", "--find-links",
+ help=("Specify a URL to search for buildout releases"))
+
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]
+######################################################################
+# load/install distribute
-if options.eggs:
- eggs_dir = os.path.abspath(os.path.expanduser(options.eggs))
-else:
- eggs_dir = tempfile.mkdtemp()
-
-if options.setup_source is None:
- if options.use_distribute:
- options.setup_source = distribute_source
- else:
- options.setup_source = setuptools_source
-
-if options.accept_buildout_test_releases:
- args.append('buildout:accept-buildout-test-releases=true')
-args.append('bootstrap')
-
+to_reload = False
try:
- import pkg_resources
- import setuptools # A flag. Sometimes pkg_resources is installed alone.
+ import pkg_resources, setuptools
if not hasattr(pkg_resources, '_distribute'):
+ to_reload = True
raise ImportError
except ImportError:
- ez_code = urllib2.urlopen(
- options.setup_source).read().replace('\r\n', '\n')
ez = {}
- exec ez_code in ez
- setup_args = dict(to_dir=eggs_dir, download_delay=0)
- if options.download_base:
- setup_args['download_base'] = options.download_base
- if options.use_distribute:
- setup_args['no_fake'] = True
+
+ try:
+ from urllib.request import urlopen
+ except ImportError:
+ from urllib2 import urlopen
+
+ exec(urlopen('http://python-distribute.org/distribute_setup.py').read(), ez)
+ setup_args = dict(to_dir=tmpeggs, download_delay=0, no_fake=True)
ez['use_setuptools'](**setup_args)
- if 'pkg_resources' in sys.modules:
- reload(sys.modules['pkg_resources'])
+
+ if to_reload:
+ reload(pkg_resources)
import pkg_resources
# This does not (always?) update the default working set. We will
# do it.
@@ -179,31 +86,26 @@
if path not in pkg_resources.working_set.entries:
pkg_resources.working_set.add_entry(path)
-cmd = [quote(sys.executable),
- '-c',
- quote('from setuptools.command.easy_install import main; main()'),
- '-mqNxd',
- quote(eggs_dir)]
+######################################################################
+# Install buildout
-if not has_broken_dash_S:
- cmd.insert(1, '-S')
+ws = pkg_resources.working_set
-find_links = options.download_base
-if not find_links:
- find_links = os.environ.get('bootstrap-testing-find-links')
+cmd = [sys.executable, '-c',
+ 'from setuptools.command.easy_install import main; main()',
+ '-mZqNxd', tmpeggs]
+
+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', quote(find_links)])
+ cmd.extend(['-f', find_links])
-if options.use_distribute:
- setup_requirement = 'distribute'
-else:
- setup_requirement = 'setuptools'
-ws = pkg_resources.working_set
-setup_requirement_path = ws.find(
- pkg_resources.Requirement.parse(setup_requirement)).location
-env = dict(
- os.environ,
- PYTHONPATH=setup_requirement_path)
+distribute_path = ws.find(
+ pkg_resources.Requirement.parse('distribute')).location
requirement = 'zc.buildout'
version = options.version
@@ -217,7 +119,7 @@
return False
return True
index = setuptools.package_index.PackageIndex(
- search_path=[setup_requirement_path])
+ search_path=[distribute_path])
if find_links:
index.add_find_links((find_links,))
req = pkg_resources.Requirement.parse(requirement)
@@ -239,22 +141,25 @@
requirement = '=='.join((requirement, version))
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
- exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
-if exitcode != 0:
- sys.stdout.flush()
- sys.stderr.flush()
- print ("An error occurred when trying to install zc.buildout. "
- "Look above this message for any errors that "
- "were output by easy_install.")
- sys.exit(exitcode)
+import subprocess
+if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+ raise Exception(
+ "Failed to execute command:\n%s",
+ repr(cmd)[1:-1])
-ws.add_entry(eggs_dir)
+######################################################################
+# Import and run buildout
+
+ws.add_entry(tmpeggs)
ws.require(requirement)
import zc.buildout.buildout
+
+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' 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
- shutil.rmtree(eggs_dir)
+shutil.rmtree(tmpeggs)
Modified: z3c.recipe.compattest/trunk/buildout.cfg
===================================================================
--- z3c.recipe.compattest/trunk/buildout.cfg 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/buildout.cfg 2013-02-26 21:06:56 UTC (rev 129863)
@@ -21,4 +21,4 @@
packages = zope.dottedname z3c.recipe.compattest
[versions]
-zc.buildout = 1.5.1
+zc.buildout = 2.0.1
Modified: z3c.recipe.compattest/trunk/setup.py
===================================================================
--- z3c.recipe.compattest/trunk/setup.py 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/setup.py 2013-02-26 21:06:56 UTC (rev 129863)
@@ -1,4 +1,4 @@
-version = '0.14dev'
+version = '1.0dev'
import os
from setuptools import setup, find_packages
@@ -22,7 +22,7 @@
+ '\n\n' +
open(os.path.join(
'src', 'z3c', 'recipe', 'compattest', 'README.txt')).read()),
- keywords = "zope3 setuptools egg kgs",
+ keywords = "zope setuptools egg kgs",
classifiers = [
'Intended Audience :: Developers',
'License :: OSI Approved :: Zope Public License',
@@ -35,14 +35,16 @@
namespace_packages=['z3c', 'z3c.recipe'],
install_requires=[
'setuptools',
- 'zc.buildout >= 1.5.1',
- 'zc.recipe.testrunner >= 1.4.0',
- ],
+ 'zc.buildout >= 2.0.0',
+ 'zc.recipe.testrunner >= 2.0.0',
+ ],
# zope.dottedname is just used as a dummy package to demonstrate things
# with, it's not actually imported
extras_require=dict(test=[
'zope.dottedname',
'zope.testing',
+ 'manuel',
+ 'six',
]),
entry_points = {
'zc.buildout': ['default = z3c.recipe.compattest.recipe:Recipe'],
Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/recipe.py 2013-02-26 21:06:56 UTC (rev 129863)
@@ -3,7 +3,6 @@
import re
import zc.buildout.easy_install
import zc.recipe.egg
-from zc.recipe.egg.egg import _BackwardsSupportOption
import zc.recipe.testrunner
@@ -63,11 +62,6 @@
if self.extra_paths:
options['extra-paths'] = self.extra_paths
- # The testrunner recipe that we are going to pass these options to
- # expects the 'query_bool' attribute to be accessible.
- # See also zc.recipe.egg:Eggs (v1.3.2)
- options = _BackwardsSupportOption(options)
-
recipe = zc.recipe.testrunner.TestRunner(
self.buildout, '%s-%s' % (self.name, package), options)
installed.extend(recipe.install())
Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.py 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.py 2013-02-26 21:06:56 UTC (rev 129863)
@@ -5,7 +5,6 @@
import time
import pickle
-from zc.buildout.easy_install import _has_broken_dash_S
def usage():
print """
@@ -34,10 +33,7 @@
# We are dealing with two problems: windoze and virtualenv.
if windoze:
# Use zc.buildout internal to sniff a virtualenv.
- if _has_broken_dash_S(sys.executable):
- cmd = [sys.executable, self.script + '-script.py']
- else:
- cmd = [self.script + '.exe']
+ cmd = [self.script + '.exe']
self.process = subprocess.Popen(
cmd + ['--exit-with-status'] + self.args,
@@ -45,7 +41,7 @@
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
close_fds=not windoze,
- )
+ )
def poll(self):
self.exitcode = self.process.poll()
Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.txt
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.txt 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/runner.txt 2013-02-26 21:06:56 UTC (rev 129863)
@@ -13,20 +13,20 @@
>>> # Re-use zc.buildout internals in order to handle both windows
>>> # and other environments.
- >>> from zc.buildout.easy_install import _write_script
+ >>> from zc.buildout.easy_install import _create_script
>>> ok_script = os.path.join(sample_buildout, 'test-ok')
- >>> _ = _write_script(ok_script, '''\
+ >>> _ = _create_script('''\
... #!%s
... import time
... time.sleep(1)
- ... print 'ok' ''' % sys.executable, 'script')
+ ... print 'ok' ''' % sys.executable, ok_script)
>>> failure_script = os.path.join(sample_buildout, 'test-failure')
- >>> _ = _write_script(failure_script, '''\
+ >>> _ = _create_script('''\
... #!%s
... import time
... time.sleep(1)
- ... raise SystemError('Fail!') ''' % sys.executable, 'script')
+ ... raise SystemError('Fail!') ''' % sys.executable, failure_script)
>>> from z3c.recipe.compattest.runner import main
>>> main(1, ok_script, failure_script, no_exit_code=True)
Modified: z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py
===================================================================
--- z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py 2013-02-26 20:37:02 UTC (rev 129862)
+++ z3c.recipe.compattest/trunk/src/z3c/recipe/compattest/testing.py 2013-02-26 21:06:56 UTC (rev 129863)
@@ -27,12 +27,13 @@
# environment
zc.buildout.testing.install('zc.recipe.testrunner', test)
zc.buildout.testing.install('zc.recipe.egg', test)
- zc.buildout.testing.install('z3c.recipe.scripts', test)
zc.buildout.testing.install('zope.testing', test)
zc.buildout.testing.install('zope.testrunner', test)
zc.buildout.testing.install('zope.interface', test)
zc.buildout.testing.install('zope.exceptions', test)
zc.buildout.testing.install('zope.dottedname', test)
+ zc.buildout.testing.install('manuel', test)
+ zc.buildout.testing.install('six', test)
def tearDown(test):
zc.buildout.testing.buildoutTearDown(test)
@@ -47,6 +48,6 @@
normalize_exe,
normalize_setuptools,
python_case_normalizer,
- ])
+ ])
return doctest.DocFileSuite(*args, **kw)
More information about the checkins
mailing list