[Checkins] SVN: zopetoolkit/ merged zope.testing-3.10 branch into trunk making trunk (mostly) compatible with zope.testing 3.10

Michael Howitz mh at gocept.com
Sat Sep 25 10:12:41 EDT 2010


Log message for revision 116919:
  merged zope.testing-3.10 branch into trunk making trunk (mostly) compatible with zope.testing 3.10
  

Changed:
  D   zopetoolkit/branches/zope.testing-3.10/COPYRIGHT.txt
  D   zopetoolkit/branches/zope.testing-3.10/LICENSE.txt
  D   zopetoolkit/branches/zope.testing-3.10/README.txt
  D   zopetoolkit/branches/zope.testing-3.10/bootstrap.py
  D   zopetoolkit/branches/zope.testing-3.10/buildout.cfg
  D   zopetoolkit/branches/zope.testing-3.10/development.cfg
  D   zopetoolkit/branches/zope.testing-3.10/index.rst
  D   zopetoolkit/branches/zope.testing-3.10/zopeapp-versions.cfg
  D   zopetoolkit/branches/zope.testing-3.10/zopeapp.cfg
  D   zopetoolkit/branches/zope.testing-3.10/ztk-versions.cfg
  D   zopetoolkit/branches/zope.testing-3.10/ztk.cfg
  U   zopetoolkit/trunk/zopeapp-versions.cfg
  U   zopetoolkit/trunk/ztk-versions.cfg

-=-
Deleted: zopetoolkit/branches/zope.testing-3.10/COPYRIGHT.txt
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/COPYRIGHT.txt	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/COPYRIGHT.txt	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1 +0,0 @@
-Zope Foundation and Contributors
\ No newline at end of file

Deleted: zopetoolkit/branches/zope.testing-3.10/LICENSE.txt
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/LICENSE.txt	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/LICENSE.txt	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,44 +0,0 @@
-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.

Deleted: zopetoolkit/branches/zope.testing-3.10/README.txt
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/README.txt	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/README.txt	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,33 +0,0 @@
-================
-The Zope Toolkit
-================
-
-The Zope Toolkit is a set of libraries maintained by the Zope project for
-building web applications, web frameworks and application servers.
-
-This directory contains the definition of the Zope Toolkit in the file
-``ztk.cfg``. It specifies the list of packages included in the ZTK and
-packages which are under review for inclusion.
-
-Also, specific versions have been tested together (including their
-dependencies) and can directly be used with a buildout by specifying the
-``ztk-versions.cfg`` file via the ``extends`` mechanism.
-
-To test the ZTK, run ``bin/test-ztk``.
-
-To generate dependency graphs for the ZTK, run ``bin/depgraph``. The
-resulting SVN graphs will be in ``parts/depgraph``.
-
-For details about the ZTK, please see http://docs.zope.org/zopetoolkit.
-
-Transition support
-------------------
-
-For a limited period of time, we maintain a second set of versions in the
-``zopeapp.cfg`` set. This transition support should help existing applications
-to move to the Zope Toolkit. You can extend from the ``zopeapp-versions.cfg``
-via the buildout extends mechanism.
-
-To test the Zope App set, run ``bin/test-zopeapp``.
-
-For more details read the ZTK 1.0 release notes.

Deleted: zopetoolkit/branches/zope.testing-3.10/bootstrap.py
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/bootstrap.py	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/bootstrap.py	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,121 +0,0 @@
-##############################################################################
-#
-# 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.
-
-$Id$
-"""
-
-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']
-
-to_reload = False
-try:
-    import pkg_resources
-    if not hasattr(pkg_resources, '_distribute'):
-        to_reload = True
-        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)
-
-    if to_reload:
-        reload(pkg_resources)
-    else:
-        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)

Deleted: zopetoolkit/branches/zope.testing-3.10/buildout.cfg
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/buildout.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/buildout.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,43 +0,0 @@
-[buildout]
-extends =
-    ztk.cfg
-    zopeapp.cfg
-
-parts =
-    test-ztk
-    test-zopeapp
-    depgraph
-    checkversions
-
-extensions = mr.developer
-
-allow-picked-versions = true
-versions = versions
-
-[versions]
-# needed by mr.developer with python 2.4:
-elementtree = 1.2.6-20050316
-
-[test-ztk]
-# individual test runners for the ztk
-recipe = z3c.recipe.compattest
-include = ${ztk:packages}
-
-[test-zopeapp]
-# individual test runners for zopeapp
-recipe = z3c.recipe.compattest
-include = ${zopeapp:packages}
-
-[depgraph]
-# script to check dependencies
-recipe = z3c.recipe.depgraph
-eggs = ${ztk:packages}
-       ${zopeapp:packages}
-extras = True
-variants = base 
-           scc
-
-[checkversions]
-# script to find newer versions
-recipe = zc.recipe.egg
-eggs = z3c.checkversions [buildout]

Deleted: zopetoolkit/branches/zope.testing-3.10/development.cfg
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/development.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/development.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,4 +0,0 @@
-[buildout]
-extends = buildout.cfg
-always-checkout = force
-auto-checkout = *

Deleted: zopetoolkit/branches/zope.testing-3.10/index.rst
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/index.rst	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/index.rst	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,45 +0,0 @@
-.. This document contains release-specific information about the Zope Toolkit.
-   It is intended for automatic inclusion by the ZTK sphinx-based
-   documentation.
-
-
-Introduction
-------------
-
-The Zope Toolkit 1.1 release is the second feature release of the Zope
-Toolkit. The Zope Toolkit really is just a collection of libraries
-managed together by the Zope developers. We typically treat each
-library independently, so you would like to look at the CHANGES.txt in
-each library for updates. Here we note larger changes, especially ones
-that affect multiple libraries.
-
-Installation
-------------
-
-The Zope Toolkit cannot be installed directly except as individual
-libraries (such as ``zope.component``). To install it you typically
-would install a framework or application that makes use of these
-libraries. Examples of such projects are BlueBream, Grok and Zope 2.
-
-If you want to use the Zope Toolkit KGS, you can use the buildout
-extends mechanism (replace 1.1a1 by the desired version)::
-
-  [buildout]
-  extends = http://download.zope.org/zopetoolkit/index/1.1a1/ztk-versions.cfg
-
-You can also copy the file locally or additionally extend the
-zopeapp-versions.cfg file from the same location.
-
-Frameworks and applications have their own set of install instructions. You
-should follow these in most cases.
-
-News
-----
-
-TODO
-
-
-Migration issues
-----------------
-
-TODO

Deleted: zopetoolkit/branches/zope.testing-3.10/zopeapp-versions.cfg
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/zopeapp-versions.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/zopeapp-versions.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,42 +0,0 @@
-[versions]
-# ZopeApp
-roman = 1.4.0
-wsgi-intercept = 0.4
-zc.sourcefactory = 0.7.0
-zodbcode = 3.4.0
-zope.app.applicationcontrol = 3.5.8
-zope.app.appsetup = 3.15.0
-zope.app.authentication = 3.7.1
-zope.app.basicskin = 3.5.1
-zope.app.broken = 3.6.0
-zope.app.component = 3.9.2
-zope.app.container = 3.9.1
-zope.app.content = 3.5.0
-zope.app.debug = 3.4.1
-zope.app.dependable = 3.5.1
-zope.app.error = 3.5.3
-zope.app.exception = 3.6.2
-zope.app.folder = 3.5.1
-zope.app.form = 4.0.2
-zope.app.generations = 3.7.0
-zope.app.http = 3.9.0
-zope.app.i18n = 3.6.3
-zope.app.interface = 3.6.0
-zope.app.locales = 3.6.2
-zope.app.localpermission = 3.7.2
-zope.app.pagetemplate = 3.11.2
-zope.app.principalannotation = 3.7.0
-zope.app.publication = 3.12.0
-zope.app.publisher = 3.10.2
-zope.app.renderer = 3.5.1
-zope.app.rotterdam = 3.5.2
-zope.app.schema = 3.5.0
-zope.app.security = 3.7.5
-zope.app.testing = 3.8.0
-zope.app.wsgi = 3.9.2
-zope.app.zcmlfiles = 3.7.0
-zope.app.zopeappgenerations = 3.6.0
-zope.generations = 3.7.0
-zope.testbrowser = 3.10.1
-
-# Deprecating

Deleted: zopetoolkit/branches/zope.testing-3.10/zopeapp.cfg
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/zopeapp.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/zopeapp.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,96 +0,0 @@
-# Copyright (c) 2010 Zope Foundation and Contributors.
-#
-# This is the specification file for the transitional zope.app.* packages
-
-[zopeapp]
-included =
-  zc.sourcefactory
-  zope.app.applicationcontrol
-  zope.app.appsetup
-  zope.app.authentication
-  zope.app.basicskin
-  zope.app.broken
-  zope.app.component
-  zope.app.container
-  zope.app.content
-  zope.app.debug
-  zope.app.dependable
-  zope.app.error
-  zope.app.exception
-  zope.app.folder
-  zope.app.form
-  zope.app.generations
-  zope.app.http
-  zope.app.i18n
-  zope.app.interface
-  zope.app.locales
-  zope.app.localpermission
-  zope.app.pagetemplate
-  zope.app.principalannotation
-  zope.app.publication
-  zope.app.publisher
-  zope.app.renderer
-  zope.app.rotterdam
-  zope.app.schema
-  zope.app.security
-  zope.app.testing
-  zope.app.wsgi
-  zope.app.zcmlfiles
-  zope.app.zopeappgenerations
-  zope.generations
-  zope.testbrowser
-#  zodbcode - test fail
-
-# These packages will be removed in the next version
-deprecating =
-
-
-packages = ${zopeapp:included}
-           ${zopeapp:deprecating}
-
-
-[buildout]
-extends = zopeapp-versions.cfg
-versions = versions
-
-
-[sources]
-# Development branches of packages of *this* ZTK version.
-# Will evolve to maintenance branches whenever needed.
-# This set of branches is tested by some buildbots!
-zc.sourcefactory = svn svn+ssh://svn.zope.org/repos/main/zc.sourcefactory/trunk
-zodbcode = svn svn+ssh://svn.zope.org/repos/main/zodbcode/trunk
-zope.app.applicationcontrol = svn svn+ssh://svn.zope.org/repos/main/zope.app.applicationcontrol/trunk
-zope.app.appsetup = svn svn+ssh://svn.zope.org/repos/main/zope.app.appsetup/branches/3.14
-zope.app.authentication = svn svn+ssh://svn.zope.org/repos/main/zope.app.authentication/trunk
-zope.app.basicskin = svn svn+ssh://svn.zope.org/repos/main/zope.app.basicskin/trunk
-zope.app.broken = svn svn+ssh://svn.zope.org/repos/main/zope.app.broken/trunk
-zope.app.component = svn svn+ssh://svn.zope.org/repos/main/zope.app.component/trunk
-zope.app.container = svn svn+ssh://svn.zope.org/repos/main/zope.app.container/trunk
-zope.app.content = svn svn+ssh://svn.zope.org/repos/main/zope.app.content/trunk
-zope.app.debug = svn svn+ssh://svn.zope.org/repos/main/zope.app.debug/trunk
-zope.app.dependable = svn svn+ssh://svn.zope.org/repos/main/zope.app.dependable/trunk
-zope.app.error = svn svn+ssh://svn.zope.org/repos/main/zope.app.error/trunk
-zope.app.exception = svn svn+ssh://svn.zope.org/repos/main/zope.app.exception/trunk
-zope.app.folder = svn svn+ssh://svn.zope.org/repos/main/zope.app.folder/trunk
-zope.app.form = svn svn+ssh://svn.zope.org/repos/main/zope.app.form/trunk
-zope.app.generations = svn svn+ssh://svn.zope.org/repos/main/zope.app.generations/trunk
-zope.app.http = svn svn+ssh://svn.zope.org/repos/main/zope.app.http/trunk
-zope.app.i18n = svn svn+ssh://svn.zope.org/repos/main/zope.app.i18n/trunk
-zope.app.interface = svn svn+ssh://svn.zope.org/repos/main/zope.app.interface/trunk
-zope.app.locales = svn svn+ssh://svn.zope.org/repos/main/zope.app.locales/trunk
-zope.app.localpermission = svn svn+ssh://svn.zope.org/repos/main/zope.app.localpermission/trunk
-zope.app.pagetemplate = svn svn+ssh://svn.zope.org/repos/main/zope.app.pagetemplate/trunk
-zope.app.principalannotation = svn svn+ssh://svn.zope.org/repos/main/zope.app.principalannotation/trunk
-zope.app.publication = svn svn+ssh://svn.zope.org/repos/main/zope.app.publication/trunk
-zope.app.publisher = svn svn+ssh://svn.zope.org/repos/main/zope.app.publisher/trunk
-zope.app.renderer = svn svn+ssh://svn.zope.org/repos/main/zope.app.renderer/trunk
-zope.app.rotterdam = svn svn+ssh://svn.zope.org/repos/main/zope.app.rotterdam/trunk
-zope.app.schema = svn svn+ssh://svn.zope.org/repos/main/zope.app.schema/trunk
-zope.app.security = svn svn+ssh://svn.zope.org/repos/main/zope.app.security/trunk
-zope.app.testing = svn svn+ssh://svn.zope.org/repos/main/zope.app.testing/trunk
-zope.app.wsgi = svn svn+ssh://svn.zope.org/repos/main/zope.app.wsgi/trunk
-zope.app.zcmlfiles = svn svn+ssh://svn.zope.org/repos/main/zope.app.zcmlfiles/trunk
-zope.app.zopeappgenerations = svn svn+ssh://svn.zope.org/repos/main/zope.app.zopeappgenerations/trunk
-zope.generations = svn svn+ssh://svn.zope.org/repos/main/zope.generations/trunk
-zope.testbrowser = svn svn+ssh://svn.zope.org/repos/main/zope.testbrowser/trunk

Deleted: zopetoolkit/branches/zope.testing-3.10/ztk-versions.cfg
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/ztk-versions.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/ztk-versions.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,109 +0,0 @@
-[versions]
-# ZTK
-zope.annotation = 3.5.0
-zope.applicationcontrol = 3.5.5
-zope.authentication = 3.7.1
-zope.broken = 3.6.0
-zope.browser = 1.3
-zope.browsermenu = 3.9.1
-zope.browserpage = 3.12.2
-zope.browserresource = 3.10.3
-zope.cachedescriptors = 3.5.1
-zope.catalog = 3.8.1
-zope.component = 3.10.0
-zope.componentvocabulary = 1.0
-zope.configuration = 3.7.2
-zope.container = 3.11.2
-zope.contentprovider = 3.7.2
-zope.contenttype = 3.5.1
-zope.copy = 3.5.0
-zope.copypastemove = 3.6.0
-zope.datetime = 3.4.0
-zope.deferredimport = 3.5.3
-zope.deprecation = 3.4.0
-zope.dottedname = 3.4.6
-zope.dublincore = 3.7.0
-zope.error = 3.7.1
-zope.event = 3.5.0-1
-zope.exceptions = 3.6.1
-zope.filerepresentation = 3.6.0
-zope.formlib = 4.0.5
-zope.hookable = 3.4.1
-zope.i18n = 3.7.4
-zope.i18nmessageid = 3.5.3
-zope.index = 3.6.1
-zope.interface = 3.6.1
-zope.intid = 3.7.2
-zope.keyreference = 3.6.2
-zope.lifecycleevent = 3.6.2
-zope.location = 3.9.0
-zope.login = 1.0.0
-zope.mimetype = 1.3.0
-zope.minmax = 1.1.2
-zope.pagetemplate = 3.5.2
-zope.password = 3.6.1
-zope.pluggableauth = 1.0.3
-zope.principalannotation = 3.6.1
-zope.principalregistry = 3.7.1
-zope.processlifetime = 1.0
-zope.proxy = 3.6.1
-zope.ptresource = 3.9.0
-zope.publisher = 3.12.4
-zope.ramcache = 1.0
-zope.schema = 3.7.0
-zope.security = 3.7.4
-zope.securitypolicy = 3.7.0
-zope.sendmail = 3.7.3
-zope.sequencesort = 3.4.0
-zope.server = 3.8.1
-zope.session = 3.9.3
-zope.site = 3.9.2
-zope.size = 3.4.1
-zope.structuredtext = 3.5.0
-zope.tal = 3.5.2
-zope.tales = 3.5.1
-zope.testing = 3.10.0
-zope.testrunner = 4.0.0b5
-zope.traversing = 3.13
-zope.viewlet = 3.7.2
-
-# Deprecating
-
-# Dependencies
-distribute = 0.6.14
-docutils = 0.7
-Jinja2 = 2.5.2
-mechanize = 0.2.2
-Paste = 1.7.4
-PasteDeploy = 1.3.3
-PasteScript = 1.7.3
-py = 1.3.2
-Pygments = 1.3.1
-python-gettext = 1.0
-python-subunit = 0.0.6
-pytz = 2010l
-RestrictedPython = 3.6.0
-setuptools = 0.6c11
-Sphinx = 1.0.3
-testtools = 0.9.6
-transaction = 1.1.0
-z3c.recipe.sphinxdoc = 0.0.8
-zc.buildout = 1.4.4
-zc.lockfile = 1.0.0
-ZConfig = 2.8.0
-zc.recipe.egg = 1.2.2
-zc.recipe.testrunner = 1.3.0
-zc.resourcelibrary = 1.3.1
-zdaemon = 2.0.4
-ZODB3 = 3.9.5
-zope.mkzeoinstance = 3.9.4
-
-# toolchain
-argparse = 1.1
-lxml = 2.2.8
-mr.developer = 1.15
-tl.eggdeps = 0.4
-z3c.checkversions = 0.4.1
-z3c.recipe.compattest = 0.12.2
-z3c.recipe.depgraph = 0.5
-zope.kgs = 1.2.0

Deleted: zopetoolkit/branches/zope.testing-3.10/ztk.cfg
===================================================================
--- zopetoolkit/branches/zope.testing-3.10/ztk.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/branches/zope.testing-3.10/ztk.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -1,159 +0,0 @@
-# Copyright (c) 2010 Zope Foundation and Contributors.
-#
-# This is the specification file for the Zope Toolkit.
-
-[ztk]
-version = 1.1dev
-
-# The core ZTK packages
-included =
-  zope.annotation
-  zope.applicationcontrol
-  zope.authentication
-  zope.broken
-  zope.browser
-  zope.browsermenu
-  zope.browserpage
-  zope.browserresource
-  zope.cachedescriptors
-  zope.catalog
-  zope.component
-  zope.componentvocabulary
-  zope.configuration
-  zope.container
-  zope.contentprovider
-  zope.contenttype
-  zope.copy
-  zope.copypastemove
-  zope.datetime
-  zope.deferredimport
-  zope.deprecation
-  zope.dottedname
-  zope.dublincore
-  zope.error
-  zope.event
-  zope.exceptions
-  zope.filerepresentation
-  zope.formlib
-  zope.hookable
-  zope.i18n
-  zope.i18nmessageid
-  zope.index
-  zope.interface
-  zope.intid
-  zope.keyreference
-  zope.lifecycleevent
-  zope.location
-  zope.login
-  zope.mimetype
-  zope.minmax
-  zope.pagetemplate
-  zope.password
-  zope.pluggableauth
-  zope.principalannotation
-  zope.principalregistry
-  zope.processlifetime
-  zope.proxy
-  zope.ptresource
-  zope.publisher
-  zope.ramcache
-  zope.schema
-  zope.security
-  zope.securitypolicy
-  zope.sendmail
-  zope.sequencesort
-  zope.server
-  zope.session
-  zope.site
-  zope.size
-  zope.structuredtext
-  zope.tal
-  zope.tales
-  zope.testing
-  zope.testrunner
-  zope.traversing
-  zope.viewlet
-
-# These packages will be removed in the next version
-deprecating =
-
-
-packages = ${ztk:included}
-           ${ztk:deprecating}
-
-
-[buildout]
-extends = ztk-versions.cfg
-versions = versions
-
-
-[sources]
-# Development branches of packages of *this* ZTK version.
-# (currently trunks, but should evolve to maintenance branches)
-# This set of branches is tested by some buildbots!
-zope.annotation = svn svn+ssh://svn.zope.org/repos/main/zope.annotation/trunk
-zope.applicationcontrol = svn svn+ssh://svn.zope.org/repos/main/zope.applicationcontrol/trunk
-zope.authentication = svn svn+ssh://svn.zope.org/repos/main/zope.authentication/trunk
-zope.broken = svn svn+ssh://svn.zope.org/repos/main/zope.broken/trunk
-zope.browser = svn svn+ssh://svn.zope.org/repos/main/zope.browser/trunk
-zope.browsermenu = svn svn+ssh://svn.zope.org/repos/main/zope.browsermenu/trunk
-zope.browserpage = svn svn+ssh://svn.zope.org/repos/main/zope.browserpage/trunk
-zope.browserresource = svn svn+ssh://svn.zope.org/repos/main/zope.browserresource/trunk
-zope.cachedescriptors = svn svn+ssh://svn.zope.org/repos/main/zope.cachedescriptors/trunk
-zope.catalog = svn svn+ssh://svn.zope.org/repos/main/zope.catalog/trunk
-zope.component = svn svn+ssh://svn.zope.org/repos/main/zope.component/trunk
-zope.componentvocabulary = svn svn+ssh://svn.zope.org/repos/main/zope.componentvocabulary/trunk
-zope.configuration = svn svn+ssh://svn.zope.org/repos/main/zope.configuration/trunk
-zope.container = svn svn+ssh://svn.zope.org/repos/main/zope.container/trunk
-zope.contentprovider = svn svn+ssh://svn.zope.org/repos/main/zope.contentprovider/trunk
-zope.contenttype = svn svn+ssh://svn.zope.org/repos/main/zope.contenttype/trunk
-zope.copy = svn svn+ssh://svn.zope.org/repos/main/zope.copy/trunk
-zope.copypastemove = svn svn+ssh://svn.zope.org/repos/main/zope.copypastemove/trunk
-zope.datetime = svn svn+ssh://svn.zope.org/repos/main/zope.datetime/trunk
-zope.deferredimport = svn svn+ssh://svn.zope.org/repos/main/zope.deferredimport/trunk
-zope.deprecation = svn svn+ssh://svn.zope.org/repos/main/zope.deprecation/trunk
-zope.dottedname = svn svn+ssh://svn.zope.org/repos/main/zope.dottedname/trunk
-zope.dublincore = svn svn+ssh://svn.zope.org/repos/main/zope.dublincore/trunk
-zope.error = svn svn+ssh://svn.zope.org/repos/main/zope.error/trunk
-zope.event = svn svn+ssh://svn.zope.org/repos/main/zope.event/trunk
-zope.exceptions = svn svn+ssh://svn.zope.org/repos/main/zope.exceptions/trunk
-zope.filerepresentation = svn svn+ssh://svn.zope.org/repos/main/zope.filerepresentation/trunk
-zope.formlib = svn svn+ssh://svn.zope.org/repos/main/zope.formlib/trunk
-zope.hookable = svn svn+ssh://svn.zope.org/repos/main/zope.hookable/trunk
-zope.i18n = svn svn+ssh://svn.zope.org/repos/main/zope.i18n/trunk
-zope.i18nmessageid = svn svn+ssh://svn.zope.org/repos/main/zope.i18nmessageid/trunk
-zope.index = svn svn+ssh://svn.zope.org/repos/main/zope.index/trunk
-zope.interface = svn svn+ssh://svn.zope.org/repos/main/zope.interface/trunk
-zope.intid = svn svn+ssh://svn.zope.org/repos/main/zope.intid/trunk
-zope.keyreference = svn svn+ssh://svn.zope.org/repos/main/zope.keyreference/trunk
-zope.lifecycleevent = svn svn+ssh://svn.zope.org/repos/main/zope.lifecycleevent/trunk
-zope.location = svn svn+ssh://svn.zope.org/repos/main/zope.location/trunk
-zope.login = svn svn+ssh://svn.zope.org/repos/main/zope.login/trunk
-zope.mimetype = svn svn+ssh://svn.zope.org/repos/main/zope.mimetype/trunk
-zope.minmax = svn svn+ssh://svn.zope.org/repos/main/zope.minmax/trunk
-zope.pagetemplate = svn svn+ssh://svn.zope.org/repos/main/zope.pagetemplate/trunk
-zope.password = svn svn+ssh://svn.zope.org/repos/main/zope.password/trunk
-zope.pluggableauth = svn svn+ssh://svn.zope.org/repos/main/zope.pluggableauth/trunk
-zope.principalannotation = svn svn+ssh://svn.zope.org/repos/main/zope.principalannotation/trunk
-zope.principalregistry = svn svn+ssh://svn.zope.org/repos/main/zope.principalregistry/trunk
-zope.processlifetime = svn svn+ssh://svn.zope.org/repos/main/zope.processlifetime/trunk
-zope.proxy = svn svn+ssh://svn.zope.org/repos/main/zope.proxy/trunk
-zope.ptresource = svn svn+ssh://svn.zope.org/repos/main/zope.ptresource/trunk
-zope.publisher = svn svn+ssh://svn.zope.org/repos/main/zope.publisher/trunk
-zope.ramcache = svn svn+ssh://svn.zope.org/repos/main/zope.ramcache/trunk
-zope.schema = svn svn+ssh://svn.zope.org/repos/main/zope.schema/trunk
-zope.security = svn svn+ssh://svn.zope.org/repos/main/zope.security/trunk
-zope.securitypolicy = svn svn+ssh://svn.zope.org/repos/main/zope.securitypolicy/trunk
-zope.sendmail = svn svn+ssh://svn.zope.org/repos/main/zope.sendmail/trunk
-zope.sequencesort = svn svn+ssh://svn.zope.org/repos/main/zope.sequencesort/trunk
-zope.server = svn svn+ssh://svn.zope.org/repos/main/zope.server/trunk
-zope.session = svn svn+ssh://svn.zope.org/repos/main/zope.session/trunk
-zope.site = svn svn+ssh://svn.zope.org/repos/main/zope.site/trunk
-zope.size = svn svn+ssh://svn.zope.org/repos/main/zope.size/trunk
-zope.structuredtext = svn svn+ssh://svn.zope.org/repos/main/zope.structuredtext/trunk
-zope.tal = svn svn+ssh://svn.zope.org/repos/main/zope.tal/trunk
-zope.tales = svn svn+ssh://svn.zope.org/repos/main/zope.tales/trunk
-zope.testing = svn svn+ssh://svn.zope.org/repos/main/zope.testing/branches/3.9
-zope.testrunner = svn svn+ssh://svn.zope.org/repos/main/zope.testrunner/trunk
-zope.traversing = svn svn+ssh://svn.zope.org/repos/main/zope.traversing/trunk
-zope.viewlet = svn svn+ssh://svn.zope.org/repos/main/zope.viewlet/trunk

Modified: zopetoolkit/trunk/zopeapp-versions.cfg
===================================================================
--- zopetoolkit/trunk/zopeapp-versions.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/trunk/zopeapp-versions.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -4,10 +4,10 @@
 wsgi-intercept = 0.4
 zc.sourcefactory = 0.7.0
 zope.app.applicationcontrol = 3.5.8
-zope.app.appsetup = 3.14.0
+zope.app.appsetup = 3.15.0
 zope.app.authentication = 3.8.0
-zope.app.basicskin = 3.5.0
-zope.app.broken = 3.5.0
+zope.app.basicskin = 3.5.1
+zope.app.broken = 3.6.0
 zope.app.component = 3.9.2
 zope.app.container = 3.9.1
 zope.app.content = 3.5.0
@@ -22,7 +22,7 @@
 zope.app.i18n = 3.6.3
 zope.app.locales = 3.6.2
 zope.app.localpermission = 3.7.2
-zope.app.pagetemplate = 3.11.1
+zope.app.pagetemplate = 3.11.2
 zope.app.principalannotation = 3.7.0
 zope.app.publication = 3.12.0
 zope.app.publisher = 3.10.2

Modified: zopetoolkit/trunk/ztk-versions.cfg
===================================================================
--- zopetoolkit/trunk/ztk-versions.cfg	2010-09-25 13:50:18 UTC (rev 116918)
+++ zopetoolkit/trunk/ztk-versions.cfg	2010-09-25 14:12:41 UTC (rev 116919)
@@ -10,20 +10,20 @@
 zope.browserresource = 3.10.3
 zope.cachedescriptors = 3.5.1
 zope.catalog = 3.8.1
-zope.component = 3.9.5
+zope.component = 3.10.0
 zope.componentvocabulary = 1.0
 zope.configuration = 3.7.2
-zope.container = 3.11.1
+zope.container = 3.11.2
 zope.contentprovider = 3.7.2
 zope.contenttype = 3.5.1
 zope.copy = 3.5.0
 zope.copypastemove = 3.6.0
 zope.datetime = 3.4.0
-zope.deferredimport = 3.5.2
+zope.deferredimport = 3.5.3
 zope.deprecation = 3.4.0
 zope.dottedname = 3.4.6
 zope.dublincore = 3.7.0
-zope.error = 3.7.0
+zope.error = 3.7.1
 zope.event = 3.5.0-1
 zope.exceptions = 3.6.1
 zope.filerepresentation = 3.6.0
@@ -35,7 +35,7 @@
 zope.interface = 3.6.1
 zope.intid = 3.7.2
 zope.keyreference = 3.6.2
-zope.lifecycleevent = 3.6.1
+zope.lifecycleevent = 3.6.2
 zope.location = 3.9.0
 zope.login = 1.0.0
 zope.mimetype = 1.3.0
@@ -44,26 +44,27 @@
 zope.password = 3.6.1
 zope.pluggableauth = 1.0.3
 zope.principalannotation = 3.6.1
-zope.principalregistry = 3.7.0
+zope.principalregistry = 3.7.1
 zope.processlifetime = 1.0
 zope.proxy = 3.6.1
 zope.ptresource = 3.9.0
 zope.publisher = 3.12.4
 zope.ramcache = 1.0
 zope.schema = 3.7.0
-zope.security = 3.7.3
-zope.securitypolicy = 3.6.1
-zope.sendmail = 3.7.2
+zope.security = 3.7.4
+zope.securitypolicy = 3.7.0
+zope.sendmail = 3.7.3
 zope.sequencesort = 3.4.0
-zope.server = 3.6.2
-zope.session = 3.9.2
-zope.site = 3.9.1
+zope.server = 3.8.1
+zope.session = 3.9.3
+zope.site = 3.9.2
 zope.size = 3.4.1
 zope.structuredtext = 3.5.0
 zope.tal = 3.5.2
 zope.tales = 3.5.1
-zope.testing = 3.9.5
+zope.testing = 3.10.0
 zope.testrunner = 4.0.0b5
+zope.testrunner = 4.0.0b5
 zope.traversing = 3.13
 zope.viewlet = 3.7.2
 
@@ -80,6 +81,7 @@
 py = 1.3.4
 Pygments = 1.3.1
 python-gettext = 1.0
+python-subunit = 0.0.6
 pytz = 2010l
 RestrictedPython = 3.6.0
 setuptools = 0.6c11
@@ -90,7 +92,7 @@
 zc.lockfile = 1.0.0
 ZConfig = 2.8.0
 zc.recipe.egg = 1.2.2
-zc.recipe.testrunner = 1.2.1
+zc.recipe.testrunner = 1.3.0
 zc.resourcelibrary = 1.3.1
 zdaemon = 2.0.4
 ZODB3 = 3.9.6



More information about the checkins mailing list