[Checkins] SVN: z3c.objpath/trunk/ - Added a `test` extra, as test require ``zope.testing``.
Michael Howitz
mh at gocept.com
Wed Aug 4 02:47:03 EDT 2010
Log message for revision 115423:
- Added a `test` extra, as test require ``zope.testing``.
- added bootstrap.py
Changed:
U z3c.objpath/trunk/CHANGES.txt
A z3c.objpath/trunk/bootstrap.py
U z3c.objpath/trunk/buildout.cfg
U z3c.objpath/trunk/setup.py
-=-
Modified: z3c.objpath/trunk/CHANGES.txt
===================================================================
--- z3c.objpath/trunk/CHANGES.txt 2010-08-04 06:42:26 UTC (rev 115422)
+++ z3c.objpath/trunk/CHANGES.txt 2010-08-04 06:47:03 UTC (rev 115423)
@@ -4,9 +4,9 @@
1.1 (unreleased)
================
-* ...
+* Added a `test` extra, as test require ``zope.testing``.
1.0 (2008-04-15)
================
-Initial public release.
+* Initial public release.
Copied: z3c.objpath/trunk/bootstrap.py (from rev 114727, zc.buildout/trunk/bootstrap/bootstrap.py)
===================================================================
--- z3c.objpath/trunk/bootstrap.py (rev 0)
+++ z3c.objpath/trunk/bootstrap.py 2010-08-04 06:47:03 UTC (rev 115423)
@@ -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 Disribute 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.objpath/trunk/buildout.cfg
===================================================================
--- z3c.objpath/trunk/buildout.cfg 2010-08-04 06:42:26 UTC (rev 115422)
+++ z3c.objpath/trunk/buildout.cfg 2010-08-04 06:47:03 UTC (rev 115423)
@@ -4,7 +4,7 @@
[test]
recipe = zc.recipe.testrunner
-eggs = z3c.objpath
+eggs = z3c.objpath [test]
# installs bin/devpython to do simple interpreter tests
[devpython]
Modified: z3c.objpath/trunk/setup.py
===================================================================
--- z3c.objpath/trunk/setup.py 2010-08-04 06:42:26 UTC (rev 115422)
+++ z3c.objpath/trunk/setup.py 2010-08-04 06:47:03 UTC (rev 115423)
@@ -31,5 +31,10 @@
'setuptools',
'zope.interface',
],
+ extras_require = dict(
+ test = [
+ 'zope.testing',
+ ],
+ ),
entry_points={},
)
More information about the checkins
mailing list