[Checkins] SVN: Zope2.buildout/trunk/ Don't pin setuptools.
Florian Schulze
florian.schulze at gmx.net
Wed Aug 27 05:33:59 EDT 2008
Log message for revision 90415:
Don't pin setuptools.
Moved zope3.cfg to versions-zope3.cfg.
Added some missing files from the Zope2 trunk.
Added dummy script which will be used to create lib/python.
Changed:
A Zope2.buildout/trunk/ZopePublicLicense.txt
A Zope2.buildout/trunk/bin/
A Zope2.buildout/trunk/bin/create_lib_python.py
U Zope2.buildout/trunk/buildout.cfg
A Zope2.buildout/trunk/test.py
U Zope2.buildout/trunk/versions-zope2.cfg
A Zope2.buildout/trunk/versions-zope3.cfg
D Zope2.buildout/trunk/zope3.cfg
-=-
Copied: Zope2.buildout/trunk/ZopePublicLicense.txt (from rev 90353, Zope/trunk/ZopePublicLicense.txt)
===================================================================
--- Zope2.buildout/trunk/ZopePublicLicense.txt (rev 0)
+++ Zope2.buildout/trunk/ZopePublicLicense.txt 2008-08-27 09:33:59 UTC (rev 90415)
@@ -0,0 +1,54 @@
+Zope Public License (ZPL) Version 2.1
+-------------------------------------
+
+A copyright notice accompanies this license document that
+identifies the copyright holders.
+
+This license has been certified as open source. It has also
+been designated as GPL compatible by the Free Software
+Foundation (FSF).
+
+Redistribution and use in source and binary forms, with or
+without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions in source code must retain the
+ accompanying copyright notice, this list of conditions,
+ and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the accompanying
+ copyright notice, this list of conditions, and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+3. Names of the copyright holders must not be used to
+ endorse or promote products derived from this software
+ without prior written permission from the copyright
+ holders.
+
+4. The right to distribute this software or to use it for
+ any purpose does not give you the right to use
+ Servicemarks (sm) or Trademarks (tm) of the copyright
+ holders. Use of them is covered by separate agreement
+ with the copyright holders.
+
+5. If any files are modified, you must cause the modified
+ files to carry prominent notices stating that you changed
+ the files and the date of any change.
+
+Disclaimer
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS''
+ AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ NO EVENT SHALL THE COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
Added: Zope2.buildout/trunk/bin/create_lib_python.py
===================================================================
--- Zope2.buildout/trunk/bin/create_lib_python.py (rev 0)
+++ Zope2.buildout/trunk/bin/create_lib_python.py 2008-08-27 09:33:59 UTC (rev 90415)
@@ -0,0 +1,3 @@
+def create_lib_python(options, buildout):
+ print options
+ print buildout
Property changes on: Zope2.buildout/trunk/bin/create_lib_python.py
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: Zope2.buildout/trunk/buildout.cfg
===================================================================
--- Zope2.buildout/trunk/buildout.cfg 2008-08-27 09:32:04 UTC (rev 90414)
+++ Zope2.buildout/trunk/buildout.cfg 2008-08-27 09:33:59 UTC (rev 90415)
@@ -6,20 +6,12 @@
test
omelette
find-links = http://download.zope.org/distribution/
-unzip = true
extends = versions-zope2.cfg
versions = versions
unzip = true
eggs =
- mechanize
Zope2
-[versions]
-zope.testing = 3.4.0
-setuptools = 0.6c8
-zc.buildout =
-zc.recipe.egg =
-
[test]
recipe = zc.recipe.testrunner<1.1dev
eggs = ${buildout:eggs}
@@ -27,3 +19,8 @@
[omelette]
recipe = collective.recipe.omelette
eggs = ${buildout:eggs}
+
+[lib_python]
+recipe = z3c.recipe.runscript
+install-script = bin/create_lib_python.py:create_lib_python
+update-script = bin/create_lib_python.py:create_lib_python
Copied: Zope2.buildout/trunk/test.py (from rev 90353, Zope/trunk/test.py)
===================================================================
--- Zope2.buildout/trunk/test.py (rev 0)
+++ Zope2.buildout/trunk/test.py 2008-08-27 09:33:59 UTC (rev 90415)
@@ -0,0 +1,117 @@
+#!/usr/bin/env python
+##############################################################################
+#
+# Copyright (c) 2004 Zope Corporation 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.
+#
+##############################################################################
+"""Zope 2 test script
+
+see zope.testing testrunner.txt
+
+$Id: test.py 33303 2005-07-13 22:28:33Z jim $
+"""
+
+import os.path, sys
+
+# Remove script directory from path:
+scriptdir = os.path.realpath(os.path.dirname(sys.argv[0]))
+sys.path[:] = [p for p in sys.path if os.path.realpath(p) != scriptdir]
+
+shome = os.environ.get('SOFTWARE_HOME')
+zhome = os.environ.get('ZOPE_HOME')
+ihome = os.environ.get('INSTANCE_HOME')
+
+if zhome:
+ zhome = os.path.realpath(zhome)
+ if shome:
+ shome = os.path.realpath(shome)
+ else:
+ shome = os.path.join(zhome, 'lib', 'python')
+elif shome:
+ shome = os.path.realpath(shome)
+ zhome = os.path.dirname(os.path.dirname(shome))
+elif ihome:
+ print >> sys.stderr, '''
+ If INSTANCE_HOME is set, then at least one of SOFTWARE_HOME or ZOPE_HOME
+ must be set
+ '''
+else:
+ # No zope home, derive it from script directory:
+ # (test.py lives in either ZOPE_HOME or ZOPE_HOME/bin)
+ parentdir, lastpart = os.path.split(scriptdir)
+ if lastpart == 'bin':
+ zhome = parentdir
+ else:
+ zhome = scriptdir
+ shome = os.path.join(zhome, 'lib', 'python')
+
+sys.path.insert(0, shome)
+
+defaults = '--tests-pattern ^tests$ -v'.split()
+defaults += ['-m',
+ '!^('
+ 'ZConfig'
+ '|'
+ 'BTrees'
+ '|'
+ 'persistent'
+ '|'
+ 'ThreadedAsync'
+ '|'
+ 'transaction'
+ '|'
+ 'ZEO'
+ '|'
+ 'ZODB'
+ '|'
+ 'ZopeUndo'
+ '|'
+ 'zdaemon'
+ '|'
+ 'zope[.]testing'
+ '|'
+ 'zope[.]app'
+ ')[.]']
+if ihome:
+ ihome = os.path.abspath(ihome)
+ defaults += ['--path', os.path.join(ihome, 'lib', 'python')]
+ products = os.path.join(ihome, 'Products')
+ if os.path.exists(products):
+ defaults += ['--package-path', products, 'Products']
+else:
+ defaults += ['--test-path', shome]
+
+from zope.testing import testrunner
+
+def load_config_file(option, opt, config_file, *ignored):
+ config_file = os.path.abspath(config_file)
+ print "Parsing %s" % config_file
+ import Zope2
+ Zope2.configure(config_file)
+
+testrunner.setup.add_option(
+ '--config-file', action="callback", type="string", dest='config_file',
+ callback=load_config_file,
+ help="""\
+Initialize Zope with the given configuration file.
+""")
+
+def filter_warnings(option, opt, *ignored):
+ import warnings
+ warnings.simplefilter('ignore', Warning, append=True)
+
+testrunner.other.add_option(
+ '--nowarnings', action="callback", callback=filter_warnings,
+ help="""\
+Install a filter to suppress warnings emitted by code.
+""")
+
+sys.exit(testrunner.run(defaults))
Modified: Zope2.buildout/trunk/versions-zope2.cfg
===================================================================
--- Zope2.buildout/trunk/versions-zope2.cfg 2008-08-27 09:32:04 UTC (rev 90414)
+++ Zope2.buildout/trunk/versions-zope2.cfg 2008-08-27 09:33:59 UTC (rev 90415)
@@ -1,10 +1,10 @@
[buildout]
-extends = http://download.zope.org/zope3.4/versions-3.4.0c1.cfg
+extends = versions-zope3.cfg
versions = versions
[versions]
zope.testing = 3.4.0
-setuptools = 0.6c8
+setuptools =
zc.buildout =
zc.recipe.egg =
Copied: Zope2.buildout/trunk/versions-zope3.cfg (from rev 90342, Zope2.buildout/trunk/zope3.cfg)
===================================================================
--- Zope2.buildout/trunk/versions-zope3.cfg (rev 0)
+++ Zope2.buildout/trunk/versions-zope3.cfg 2008-08-27 09:33:59 UTC (rev 90415)
@@ -0,0 +1,172 @@
+# KGS of Zope3 3.4.0c1
+[versions]
+ClientForm = 0.2.7
+RestrictedPython = 3.4.2
+ZConfig = 2.5.1
+ZODB3 = 3.8.0
+docutils = 0.4
+jquery.javascript = 1.0.0
+jquery.layer = 1.0.0
+lxml = 1.3.6
+mechanize = 0.1.7b
+pytz = 2007k
+setuptools = 0.6c7
+z3c.coverage = 1.1.1
+z3c.csvvocabulary = 1.0.0
+z3c.etestbrowser = 1.0.4
+z3c.form = 1.8.0
+z3c.formdemo = 1.5.1
+z3c.formjs = 0.3.0
+z3c.formjsdemo = 0.3.0
+z3c.formui = 1.4.1
+z3c.i18n = 0.1.1
+z3c.layer = 0.2.3
+z3c.macro = 1.1.0
+z3c.macroviewlet = 1.0.0
+z3c.menu = 0.2.0
+z3c.optionstorage = 1.0.4
+z3c.pagelet = 1.0.2
+z3c.rml = 0.7.3
+z3c.skin.pagelet = 1.0.2
+z3c.template = 1.1.0
+z3c.testing = 0.2.0
+z3c.traverser = 0.2.1
+z3c.viewlet = 1.0.0
+z3c.viewtemplate = 0.3.2
+z3c.zrtresource = 1.0.1
+zc.buildout = 1.0.0
+zc.catalog = 1.2.0
+zc.datetimewidget = 0.5.2
+zc.i18n = 0.5.2
+zc.recipe.egg = 1.0.0
+zc.recipe.filestorage = 1.0.0
+zc.recipe.testrunner = 1.0.0
+zc.resourcelibrary = 0.8.2
+zc.table = 0.6
+zc.zope3recipes = 0.6.1
+zdaemon = 2.0.1
+zodbcode = 3.4.0
+zope.annotation = 3.4.0
+zope.app.annotation = 3.4.0
+zope.app.apidoc = 3.4.3
+zope.app.applicationcontrol = 3.4.1
+zope.app.appsetup = 3.4.1
+zope.app.authentication = 3.4.1
+zope.app.basicskin = 3.4.0
+zope.app.boston = 3.4.0
+zope.app.broken = 3.4.0
+zope.app.cache = 3.4.0
+zope.app.catalog = 3.5.1
+zope.app.component = 3.4.1
+zope.app.container = 3.5.3
+zope.app.content = 3.4.0
+zope.app.dav = 3.4.1
+zope.app.debug = 3.4.0
+zope.app.debugskin = 3.4.0
+zope.app.dependable = 3.4.0
+zope.app.dtmlpage = 3.4.1
+zope.app.error = 3.5.1
+zope.app.exception = 3.4.1
+zope.app.externaleditor = 3.4.0
+zope.app.file = 3.4.2
+zope.app.folder = 3.4.0
+zope.app.form = 3.4.1
+zope.app.ftp = 3.4.0
+zope.app.generations = 3.4.1
+zope.app.homefolder = 3.4.0
+zope.app.http = 3.4.1
+zope.app.i18n = 3.4.4
+zope.app.i18nfile = 3.4.1
+zope.app.interface = 3.4.0
+zope.app.interpreter = 3.4.0
+zope.app.intid = 3.4.1
+zope.app.keyreference = 3.4.1
+zope.app.layers = 3.4.0
+zope.app.locales = 3.4.1
+zope.app.locking = 3.4.0
+zope.app.module = 3.4.0
+zope.app.onlinehelp = 3.4.1
+zope.app.pagetemplate = 3.4.0
+zope.app.pluggableauth = 3.4.0
+zope.app.preference = 3.4.1
+zope.app.preview = 3.4.0
+zope.app.principalannotation = 3.4.0
+zope.app.publication = 3.4.3
+zope.app.publisher = 3.4.1
+zope.app.pythonpage = 3.4.0
+zope.app.renderer = 3.4.0
+zope.app.rotterdam = 3.4.1
+zope.app.schema = 3.4.0
+zope.app.security = 3.4.0
+zope.app.securitypolicy = 3.4.6
+zope.app.server = 3.4.0
+zope.app.session = 3.5.1
+zope.app.skins = 3.4.0
+zope.app.sqlscript = 3.4.1
+zope.app.testing = 3.4.1
+zope.app.traversing = 3.4.0
+zope.app.tree = 3.4.0
+zope.app.twisted = 3.4.0
+zope.app.undo = 3.4.0
+zope.app.wfmc = 0.1.2
+zope.app.workflow = 3.4.1
+zope.app.wsgi = 3.4.0
+zope.app.xmlrpcintrospection = 3.4.0
+zope.app.zapi = 3.4.0
+zope.app.zcmlfiles = 3.4.3
+zope.app.zopeappgenerations = 3.4.0
+zope.app.zptpage = 3.4.1
+zope.cachedescriptors = 3.4.0
+zope.component = 3.4.0
+zope.configuration = 3.4.0
+zope.contentprovider = 3.4.0
+zope.contenttype = 3.4.0
+zope.copypastemove = 3.4.0
+zope.datetime = 3.4.0
+zope.decorator = 3.4.0
+zope.deferredimport = 3.4.0
+zope.deprecation = 3.4.0
+zope.documenttemplate = 3.4.0
+zope.dottedname = 3.4.2
+zope.dublincore = 3.4.0
+zope.error = 3.5.1
+zope.event = 3.4.0
+zope.exceptions = 3.4.0
+zope.file = 0.3.0
+zope.filerepresentation = 3.4.0
+zope.formlib = 3.4.0
+zope.hookable = 3.4.0
+zope.html = 1.0.1
+zope.i18n = 3.4.0
+zope.i18nmessageid = 3.4.3
+zope.index = 3.4.1
+zope.interface = 3.4.1
+zope.lifecycleevent = 3.4.0
+zope.location = 3.4.0
+zope.mimetype = 0.3.0
+zope.minmax = 1.1.0
+zope.modulealias = 3.4.0
+zope.pagetemplate = 3.4.0
+zope.proxy = 3.4.0
+zope.publisher = 3.4.2
+zope.rdb = 3.4.0
+zope.schema = 3.4.0
+zope.security = 3.4.0
+zope.securitypolicy = 3.4.0
+zope.sendmail = 3.4.0
+zope.sequencesort = 3.4.0
+zope.server = 3.4.1
+zope.session = 3.4.1
+zope.size = 3.4.0
+zope.structuredtext = 3.4.0
+zope.tal = 3.4.1
+zope.tales = 3.4.0
+zope.testbrowser = 3.4.2
+zope.testing = 3.5.1
+zope.testrecorder = 0.3.0
+zope.thread = 3.4
+zope.traversing = 3.4.0
+zope.ucol = 1.0.2
+zope.viewlet = 3.4.2
+zope.wfmc = 3.4.0
+zope.xmlpickle = 3.4.0
\ No newline at end of file
Deleted: Zope2.buildout/trunk/zope3.cfg
===================================================================
--- Zope2.buildout/trunk/zope3.cfg 2008-08-27 09:32:04 UTC (rev 90414)
+++ Zope2.buildout/trunk/zope3.cfg 2008-08-27 09:33:59 UTC (rev 90415)
@@ -1,171 +0,0 @@
-[versions]
-ClientForm = 0.2.7
-RestrictedPython = 3.4.2
-ZConfig = 2.5.1
-ZODB3 = 3.8.0
-docutils = 0.4
-jquery.javascript = 1.0.0
-jquery.layer = 1.0.0
-lxml = 1.3.6
-mechanize = 0.1.7b
-pytz = 2007k
-setuptools = 0.6c7
-z3c.coverage = 1.1.1
-z3c.csvvocabulary = 1.0.0
-z3c.etestbrowser = 1.0.4
-z3c.form = 1.8.0
-z3c.formdemo = 1.5.1
-z3c.formjs = 0.3.0
-z3c.formjsdemo = 0.3.0
-z3c.formui = 1.4.1
-z3c.i18n = 0.1.1
-z3c.layer = 0.2.3
-z3c.macro = 1.1.0
-z3c.macroviewlet = 1.0.0
-z3c.menu = 0.2.0
-z3c.optionstorage = 1.0.4
-z3c.pagelet = 1.0.2
-z3c.rml = 0.7.3
-z3c.skin.pagelet = 1.0.2
-z3c.template = 1.1.0
-z3c.testing = 0.2.0
-z3c.traverser = 0.2.1
-z3c.viewlet = 1.0.0
-z3c.viewtemplate = 0.3.2
-z3c.zrtresource = 1.0.1
-zc.buildout = 1.0.0
-zc.catalog = 1.2.0
-zc.datetimewidget = 0.5.2
-zc.i18n = 0.5.2
-zc.recipe.egg = 1.0.0
-zc.recipe.filestorage = 1.0.0
-zc.recipe.testrunner = 1.0.0
-zc.resourcelibrary = 0.8.2
-zc.table = 0.6
-zc.zope3recipes = 0.6.1
-zdaemon = 2.0.1
-zodbcode = 3.4.0
-zope.annotation = 3.4.0
-zope.app.annotation = 3.4.0
-zope.app.apidoc = 3.4.3
-zope.app.applicationcontrol = 3.4.1
-zope.app.appsetup = 3.4.1
-zope.app.authentication = 3.4.1
-zope.app.basicskin = 3.4.0
-zope.app.boston = 3.4.0
-zope.app.broken = 3.4.0
-zope.app.cache = 3.4.0
-zope.app.catalog = 3.5.1
-zope.app.component = 3.4.1
-zope.app.container = 3.5.3
-zope.app.content = 3.4.0
-zope.app.dav = 3.4.1
-zope.app.debug = 3.4.0
-zope.app.debugskin = 3.4.0
-zope.app.dependable = 3.4.0
-zope.app.dtmlpage = 3.4.1
-zope.app.error = 3.5.1
-zope.app.exception = 3.4.1
-zope.app.externaleditor = 3.4.0
-zope.app.file = 3.4.2
-zope.app.folder = 3.4.0
-zope.app.form = 3.4.1
-zope.app.ftp = 3.4.0
-zope.app.generations = 3.4.1
-zope.app.homefolder = 3.4.0
-zope.app.http = 3.4.1
-zope.app.i18n = 3.4.4
-zope.app.i18nfile = 3.4.1
-zope.app.interface = 3.4.0
-zope.app.interpreter = 3.4.0
-zope.app.intid = 3.4.1
-zope.app.keyreference = 3.4.1
-zope.app.layers = 3.4.0
-zope.app.locales = 3.4.1
-zope.app.locking = 3.4.0
-zope.app.module = 3.4.0
-zope.app.onlinehelp = 3.4.1
-zope.app.pagetemplate = 3.4.0
-zope.app.pluggableauth = 3.4.0
-zope.app.preference = 3.4.1
-zope.app.preview = 3.4.0
-zope.app.principalannotation = 3.4.0
-zope.app.publication = 3.4.3
-zope.app.publisher = 3.4.1
-zope.app.pythonpage = 3.4.0
-zope.app.renderer = 3.4.0
-zope.app.rotterdam = 3.4.1
-zope.app.schema = 3.4.0
-zope.app.security = 3.4.0
-zope.app.securitypolicy = 3.4.6
-zope.app.server = 3.4.0
-zope.app.session = 3.5.1
-zope.app.skins = 3.4.0
-zope.app.sqlscript = 3.4.1
-zope.app.testing = 3.4.1
-zope.app.traversing = 3.4.0
-zope.app.tree = 3.4.0
-zope.app.twisted = 3.4.0
-zope.app.undo = 3.4.0
-zope.app.wfmc = 0.1.2
-zope.app.workflow = 3.4.1
-zope.app.wsgi = 3.4.0
-zope.app.xmlrpcintrospection = 3.4.0
-zope.app.zapi = 3.4.0
-zope.app.zcmlfiles = 3.4.3
-zope.app.zopeappgenerations = 3.4.0
-zope.app.zptpage = 3.4.1
-zope.cachedescriptors = 3.4.0
-zope.component = 3.4.0
-zope.configuration = 3.4.0
-zope.contentprovider = 3.4.0
-zope.contenttype = 3.4.0
-zope.copypastemove = 3.4.0
-zope.datetime = 3.4.0
-zope.decorator = 3.4.0
-zope.deferredimport = 3.4.0
-zope.deprecation = 3.4.0
-zope.documenttemplate = 3.4.0
-zope.dottedname = 3.4.2
-zope.dublincore = 3.4.0
-zope.error = 3.5.1
-zope.event = 3.4.0
-zope.exceptions = 3.4.0
-zope.file = 0.3.0
-zope.filerepresentation = 3.4.0
-zope.formlib = 3.4.0
-zope.hookable = 3.4.0
-zope.html = 1.0.1
-zope.i18n = 3.4.0
-zope.i18nmessageid = 3.4.3
-zope.index = 3.4.1
-zope.interface = 3.4.1
-zope.lifecycleevent = 3.4.0
-zope.location = 3.4.0
-zope.mimetype = 0.3.0
-zope.minmax = 1.1.0
-zope.modulealias = 3.4.0
-zope.pagetemplate = 3.4.0
-zope.proxy = 3.4.0
-zope.publisher = 3.4.2
-zope.rdb = 3.4.0
-zope.schema = 3.4.0
-zope.security = 3.4.0
-zope.securitypolicy = 3.4.0
-zope.sendmail = 3.4.0
-zope.sequencesort = 3.4.0
-zope.server = 3.4.1
-zope.session = 3.4.1
-zope.size = 3.4.0
-zope.structuredtext = 3.4.0
-zope.tal = 3.4.1
-zope.tales = 3.4.0
-zope.testbrowser = 3.4.2
-zope.testing = 3.5.1
-zope.testrecorder = 0.3.0
-zope.thread = 3.4
-zope.traversing = 3.4.0
-zope.ucol = 1.0.2
-zope.viewlet = 3.4.2
-zope.wfmc = 3.4.0
-zope.xmlpickle = 3.4.0
\ No newline at end of file
More information about the Checkins
mailing list