update testing infra

.travis.yml

@@ -3,8 +3,8 @@ python:
   - 2.7
 install:
   - mkdir -p buildout-cache/{eggs,downloads}
-  - python bootstrap.py -c travis.cfg
+  - python bootstrap.py -c travis.cfg -d
-  - bin/buildout -Nc travis.cfg
+  - bin/buildout -c travis.cfg -N -q -t 3
 script:
   - bin/test
 notifications:

base.cfg

@@ -1,28 +1,11 @@
 [buildout]
-plone-version = 4.2.3
 package-name = collective.dms.basecontent
 package-extras = [test]
-
 extends =
-    http://dist.plone.org/release/4.2-latest/versions.cfg
+    https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
-    checkouts.cfg
     sources.cfg
+    checkouts.cfg
     versions.cfg
-
 extensions =
     mr.developer
-
+show-picked-versions = true
-develop = .
-
-parts +=
-    test
-
-eggs +=
-	Pillow
-
-[test]
-recipe = zc.recipe.testrunner
-eggs =
-    ${buildout:eggs}
-    ${buildout:package-name} ${buildout:package-extras}
-defaults = ['-s', '${buildout:package-name}', '--auto-color', '--auto-progress']

bootstrap.py

@@ -18,10 +18,75 @@ The script accepts buildout command-line options, so you can
 use the -c option to specify an alternate configuration file.
 """
 
-import os, shutil, sys, tempfile
+import os, shutil, sys, tempfile, urllib, urllib2, subprocess
 from optparse import OptionParser
 
-tmpeggs = tempfile.mkdtemp()
+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
+
+# 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 = '''\
 [DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options]
@@ -36,8 +101,26 @@ local resources, you can keep this script from going over the network.
 '''
 
 parser = OptionParser(usage=usage)
-parser.add_option("-v", "--version", help="use a specific zc.buildout version")
+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("-t", "--accept-buildout-test-releases",
                   dest='accept_buildout_test_releases',
                   action="store_true", default=False,
@@ -47,38 +130,49 @@ parser.add_option("-t", "--accept-buildout-test-releases",
                         "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", "--config-file",
+parser.add_option("-c", None, action="store", dest="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
-# load/install distribute
+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:
+    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, setuptools
+    import pkg_resources
+    import setuptools  # A flag.  Sometimes pkg_resources is installed alone.
     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
-    try:
+    setup_args = dict(to_dir=eggs_dir, download_delay=0)
-        from urllib.request import urlopen
+    if options.download_base:
-    except ImportError:
+        setup_args['download_base'] = options.download_base
-        from urllib2 import urlopen
+    if options.use_distribute:
-
+        setup_args['no_fake'] = True
-    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:
-    if to_reload:
+        reload(sys.modules['pkg_resources'])
-        reload(pkg_resources)
     import pkg_resources
     # This does not (always?) update the default working set.  We will
     # do it.
@@ -86,26 +180,31 @@ except ImportError:
         if path not in pkg_resources.working_set.entries:
             pkg_resources.working_set.add_entry(path)
 
-######################################################################
+cmd = [quote(sys.executable),
-# Install buildout
+       '-c',
+       quote('from setuptools.command.easy_install import main; main()'),
+       '-mqNxd',
+       quote(eggs_dir)]
 
-ws  = pkg_resources.working_set
+if not has_broken_dash_S:
+    cmd.insert(1, '-S')
 
-cmd = [sys.executable, '-c',
+find_links = options.download_base
-       'from setuptools.command.easy_install import main; main()',
+if not find_links:
-       '-mZqNxd', tmpeggs]
+    find_links = os.environ.get('bootstrap-testing-find-links')
-
-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])
+    cmd.extend(['-f', quote(find_links)])
 
-distribute_path = ws.find(
+if options.use_distribute:
-    pkg_resources.Requirement.parse('distribute')).location
+    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)
 
 requirement = 'zc.buildout'
 version = options.version
@@ -113,13 +212,14 @@ if version is None and not options.accept_buildout_test_releases:
     # 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):
                 return False
         return True
     index = setuptools.package_index.PackageIndex(
-        search_path=[distribute_path])
+        search_path=[setup_requirement_path])
     if find_links:
         index.add_find_links((find_links,))
     req = pkg_resources.Requirement.parse(requirement)
@@ -141,26 +241,22 @@ if version:
     requirement = '=='.join((requirement, version))
 cmd.append(requirement)
 
-import subprocess
+if is_jython:
-if subprocess.call(cmd, env=dict(os.environ, PYTHONPATH=distribute_path)) != 0:
+    import subprocess
-    raise Exception(
+    exitcode = subprocess.Popen(cmd, env=env).wait()
-        "Failed to execute command:\n%s",
+else:  # Windows prefers this, apparently; otherwise we would prefer subprocess
-        repr(cmd)[1:-1])
+    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)
 
-######################################################################
+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)
-shutil.rmtree(tmpeggs)
+if not options.eggs:  # clean up temporary egg directory
-
+    shutil.rmtree(eggs_dir)

buildout.cfg

@@ -1,13 +1,10 @@
 [buildout]
 extends =
     base.cfg
-
-extensions +=
-
 parts +=
     omelette
-
+eggs +=
-show-picked-versions = true
+    ipdb
 
 [omelette]
 recipe = collective.recipe.omelette

checkouts.cfg

@@ -1,11 +1,6 @@
 [buildout]
 extends =
-    https://raw.github.com/plone/buildout.coredev/4.2/sources.cfg
+    https://raw.github.com/plone/buildout.coredev/4.3/sources.cfg
-    https://raw.github.com/plone/buildout.dexterity/master/sources.cfg
 always-checkout = force
 auto-checkout +=
-    plone.app.dexterity
-    plone.dexterity
-    z3c.form
-    plone.app.z3cform
     collective.z3cform.rolefield

sources.cfg

@@ -1,10 +1,7 @@
+[buildout]
+extends = https://raw.github.com/plone/buildout.coredev/4.3/sources.cfg
+
 [remotes]
-collective = git://github.com/collective
-collective_push = git@github.com:collective
-zopefoundation = git://github.com/zopefoundation
-zopefoundation_push = git@github.com:zopefoundation
-plone = git://github.com/plone
-plone_push = git@github.com:plone
 tdesvenain = git://github.com/tdesvenain
 tdesvenain_push = git@github.com:tdesvenain
 vincentfretin = git://github.com/vincentfretin
@@ -15,8 +12,4 @@ entrouvert = git://repos.entrouvert.org
 entrouvert_push = git+ssh://git@repos.entrouvert.org
 
 [sources]
-collective.dms.thesaurus = git ${remotes:collective}/collective.dms.thesaurus.git pushurl=${remotes:collective_push}/collective.dms.thesaurus.git
+collective.z3cform.rolefield = git ${remotes:collective}/collective.z3cform.rolefield.git pushurl=${remotes:collective_push}/collective.z3cform.rolefield.git
-collective.dms.basecontent = git ${remotes:collective}/collective.dms.basecontent.git pushurl=${remotes:collective_push}/collective.dms.basecontent.git
-collective.z3cform.rolefield = git ${remotes:collective}/collective.z3cform.rolefield.git pushurl=${remotes:collective_push}/collective.z3cform.rolefield.git
-plone.app.z3cform = git ${remotes:plone}/plone.app.z3cform.git pushurl=${remotes:plone_push}/plone.app.z3cform.git
-z3c.form = git ${remotes:zopefoundation}/z3c.form pushurl=${remotes:zopefoundation_push}/z3c.form

travis.cfg

@@ -1,27 +1,5 @@
 [buildout]
 extends =
+    https://raw.github.com/collective/buildout.plonetest/master/travis-4.3.x.cfg
     base.cfg
-
+parts = download install test
-parts =
-    download
-    install
-    test
-
-# network speedup
-eggs-directory = buildout-cache/eggs
-download-cache = buildout-cache/downloads
-
-socket-timeout = 3
-
-allow-hosts =
-    *.python.org
-    launchpad.net
-
-[download]
-recipe = hexagonit.recipe.download
-url = https://launchpad.net/plone/4.2/${buildout:plone-version}/+download/Plone-${buildout:plone-version}-UnifiedInstaller.tgz
-
-[install]
-recipe = collective.recipe.cmd
-on_install = true
-cmds = tar jxvf ${download:location}/Plone-${buildout:plone-version}-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null

versions.cfg

@@ -1,6 +1,2 @@
 [versions]
-Pillow = 1.7.8
+zc.buildout = 2.1.0
-ecreall.helpers.testing = 1.3
-collective.recipe.cmd = 0.6
-hexagonit.recipe.download = 1.6
-zc.buildout = 1.6.3