[Checkins] SVN: z3c.zcmlhook/trunk/ - Added test extra to declare test dependency on ``zope.component

Michael Howitz mh at gocept.com
Fri Nov 12 02:35:19 EST 2010


Log message for revision 118360:
  - Added test extra to declare test dependency on ``zope.component
    [test]``. [icemac]
  

Changed:
  A   z3c.zcmlhook/trunk/bootstrap.py
  U   z3c.zcmlhook/trunk/buildout.cfg
  U   z3c.zcmlhook/trunk/docs/HISTORY.txt
  D   z3c.zcmlhook/trunk/setup.cfg

-=-
Copied: z3c.zcmlhook/trunk/bootstrap.py (from rev 115622, zc.buildout/trunk/bootstrap/bootstrap.py)
===================================================================
--- z3c.zcmlhook/trunk/bootstrap.py	                        (rev 0)
+++ z3c.zcmlhook/trunk/bootstrap.py	2010-11-12 07:35:19 UTC (rev 118360)
@@ -0,0 +1,116 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+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, 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 Distribute rather than Setuptools.")
+
+parser.add_option("-c", None, action="store", dest="config_file",
+                   help=("Specify the path to the buildout configuration "
+                         "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+    args += ['-c', options.config_file]
+
+if options.version is not None:
+    VERSION = '==%s' % options.version
+else:
+    VERSION = ''
+
+USE_DISTRIBUTE = options.distribute
+args = args + ['bootstrap']
+
+try:
+    import pkg_resources
+    import setuptools
+    if not hasattr(pkg_resources, '_distribute'):
+        raise ImportError
+except ImportError:
+    ez = {}
+    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, 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)
+
+    reload(sys.modules['pkg_resources'])
+    import pkg_resources
+
+if sys.platform == 'win32':
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
+
+if USE_DISTRIBUTE:
+    requirement = 'distribute'
+else:
+    requirement = 'setuptools'
+
+if is_jython:
+    import subprocess
+
+    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
+           quote(tmpeggs), 'zc.buildout' + VERSION],
+           env=dict(os.environ,
+               PYTHONPATH=
+               ws.find(pkg_resources.Requirement.parse(requirement)).location
+               ),
+           ).wait() == 0
+
+else:
+    assert os.spawnle(
+        os.P_WAIT, sys.executable, quote (sys.executable),
+        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
+        dict(os.environ,
+            PYTHONPATH=
+            ws.find(pkg_resources.Requirement.parse(requirement)).location
+            ),
+        ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout' + VERSION)
+import zc.buildout.buildout
+zc.buildout.buildout.main(args)
+shutil.rmtree(tmpeggs)

Modified: z3c.zcmlhook/trunk/buildout.cfg
===================================================================
--- z3c.zcmlhook/trunk/buildout.cfg	2010-11-12 07:34:52 UTC (rev 118359)
+++ z3c.zcmlhook/trunk/buildout.cfg	2010-11-12 07:35:19 UTC (rev 118360)
@@ -4,5 +4,5 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = z3c.zcmlhook
+eggs = z3c.zcmlhook [test]
 defaults = ['--exit-with-status', '--auto-progress', '--auto-color']

Modified: z3c.zcmlhook/trunk/docs/HISTORY.txt
===================================================================
--- z3c.zcmlhook/trunk/docs/HISTORY.txt	2010-11-12 07:34:52 UTC (rev 118359)
+++ z3c.zcmlhook/trunk/docs/HISTORY.txt	2010-11-12 07:35:19 UTC (rev 118360)
@@ -1,8 +1,15 @@
 Changelog
 =========
 
-1.0b1 - January 2nd, 2010
--------------------------
+1.0b2 (unreleased)
+------------------
 
+- Added test extra to declare test dependency on ``zope.component
+  [test]``. [icemac]
+
+
+1.0b1 (2010-01-02)
+------------------
+
 * Initial release
   [optilude]

Deleted: z3c.zcmlhook/trunk/setup.cfg
===================================================================
--- z3c.zcmlhook/trunk/setup.cfg	2010-11-12 07:34:52 UTC (rev 118359)
+++ z3c.zcmlhook/trunk/setup.cfg	2010-11-12 07:35:19 UTC (rev 118360)
@@ -1,4 +0,0 @@
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-



More information about the checkins mailing list