[Checkins] SVN: z3c.relationfieldui/trunk/ * Added previously not declared test dependency on `zope.app.testing`.
Michael Howitz
mh at gocept.com
Mon Oct 4 02:18:37 EDT 2010
Log message for revision 117206:
* Added previously not declared test dependency on `zope.app.testing`.
* Updated tests to run with current Grok version.
* Pinned hurry.resouce to a compatible version.
Changed:
U z3c.relationfieldui/trunk/CHANGES.txt
A z3c.relationfieldui/trunk/bootstrap.py
U z3c.relationfieldui/trunk/buildout.cfg
U z3c.relationfieldui/trunk/setup.py
U z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml
-=-
Modified: z3c.relationfieldui/trunk/CHANGES.txt
===================================================================
--- z3c.relationfieldui/trunk/CHANGES.txt 2010-10-03 23:44:22 UTC (rev 117205)
+++ z3c.relationfieldui/trunk/CHANGES.txt 2010-10-04 06:18:36 UTC (rev 117206)
@@ -6,6 +6,12 @@
* Clearly specify license as ZPL.
+* Added previously not declared test dependency on `zope.app.testing`.
+
+* Updated tests to run with current Grok version.
+
+* Pinned hurry.resouce to a compatible version.
+
0.5 (2009-02-10)
================
Copied: z3c.relationfieldui/trunk/bootstrap.py (from rev 115622, zc.buildout/trunk/bootstrap/bootstrap.py)
===================================================================
--- z3c.relationfieldui/trunk/bootstrap.py (rev 0)
+++ z3c.relationfieldui/trunk/bootstrap.py 2010-10-04 06:18:36 UTC (rev 117206)
@@ -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.relationfieldui/trunk/buildout.cfg
===================================================================
--- z3c.relationfieldui/trunk/buildout.cfg 2010-10-03 23:44:22 UTC (rev 117205)
+++ z3c.relationfieldui/trunk/buildout.cfg 2010-10-04 06:18:36 UTC (rev 117206)
@@ -1,18 +1,18 @@
[buildout]
develop = .
-
parts = test
-extends = http://grok.zope.org/releaseinfo/grok-0.14.1.cfg
+extends = http://grok.zope.org/releaseinfo/grok-1.1.1.cfg
+allow-picked-versions = false
versions = versions
[versions]
-lxml = 2.0.9
-zope.testing = 3.6.0
-# 0.4.0 introduces dependency on zope.browser, but without
-# a newer zope.app.form that will lead to problems. for now lock them
-# down
-zc.sourcefactory = 0.3.4
-zope.app.form = 3.4.1
+hurry.resource = 0.4.1
+hurry.zoperesource = 0.5
+lxml = 2.2.6
+z3c.objpath = 1.0
+z3c.relationfield = 0.6.1
+z3c.schema2xml = 1.0
+zc.relation = 1.0
[test]
recipe = zc.recipe.testrunner
Modified: z3c.relationfieldui/trunk/setup.py
===================================================================
--- z3c.relationfieldui/trunk/setup.py 2010-10-03 23:44:22 UTC (rev 117205)
+++ z3c.relationfieldui/trunk/setup.py 2010-10-04 06:18:36 UTC (rev 117206)
@@ -35,8 +35,10 @@
'zc.sourcefactory',
'grokcore.component',
'grokcore.view',
- 'hurry.resource',
- 'hurry.zoperesource >= 0.3', # for testing
+ 'hurry.resource < 0.9',
+ # for testing:
+ 'hurry.zoperesource >= 0.3, <0.6',
+ 'zope.app.testing',
],
entry_points={},
)
Modified: z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml
===================================================================
--- z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml 2010-10-03 23:44:22 UTC (rev 117205)
+++ z3c.relationfieldui/trunk/src/z3c/relationfieldui/ftesting.zcml 2010-10-04 06:18:36 UTC (rev 117206)
@@ -10,8 +10,8 @@
<include package="zope.app.zcmlfiles" />
<include package="zope.app.authentication" />
- <include package="zope.app.keyreference" />
- <include package="zope.app.intid" />
+ <include package="zope.keyreference" />
+ <include package="zope.intid" />
<include package="z3c.relationfieldui" />
More information about the checkins
mailing list