[Checkins] SVN: zopetoolkit/branches/ccomb/ removed extra.cfg and updated other files accordingly
Christophe Combelles
ccomb at free.fr
Sat Jun 19 19:05:35 EDT 2010
Log message for revision 113705:
removed extra.cfg and updated other files accordingly
Changed:
U zopetoolkit/branches/ccomb/buildout.cfg
D zopetoolkit/branches/ccomb/extra-versions.cfg
D zopetoolkit/branches/ccomb/extra.cfg
U zopetoolkit/branches/ccomb/zopeapp-versions.cfg
U zopetoolkit/branches/ccomb/zopeapp.cfg
U zopetoolkit/branches/ccomb/ztk-versions.cfg
U zopetoolkit/branches/ccomb/ztk.cfg
-=-
Modified: zopetoolkit/branches/ccomb/buildout.cfg
===================================================================
--- zopetoolkit/branches/ccomb/buildout.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/buildout.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -1,4 +1,8 @@
[buildout]
+extends =
+ ztk.cfg
+ zopeapp.cfg
+
parts =
test-ztk
test-zopeapp
@@ -7,26 +11,34 @@
extensions = mr.developer
# buildout.dumppickedversions
+
allow-picked-versions = false
+versions = versions
-extends =
- ztk.cfg
- zopeapp.cfg
- ztk-versions.cfg
- zopeapp-versions.cfg
- extra-versions.cfg
+[versions]
+# versions for additional tools
+infrae.subversion = 1.4.5
+tl.eggdeps = 0.4
+z3c.recipe.compattest = 0.12.1
+z3c.recipe.depgraph = 0.5
+z3c.checkversions = 0.2
+mr.developer = 1.10
+# needed by mr.developer with python 2.4:
+# we can upgrade to 1.2.7 as soon as it is released
+elementtree = 1.2.6-20050316
-versions = versions
-
[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}
@@ -35,5 +47,6 @@
scc
[checkversions]
+# script to find newer versions
recipe = zc.recipe.egg
eggs = z3c.checkversions [buildout]
Deleted: zopetoolkit/branches/ccomb/extra-versions.cfg
===================================================================
--- zopetoolkit/branches/ccomb/extra-versions.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/extra-versions.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -1,54 +0,0 @@
-[versions]
-Chameleon = 1.2.3
-Jinja2 = 2.4.1
-Pygments = 1.3.1
-RestrictedPython = 3.5.1
-Sphinx = 0.6.5
-ZConfig = 2.8.0
-ZODB3 = 3.9.5
-argparse = 1.1
-distribute = 0.6.10
-docutils = 0.6
-elementtree = 1.2.6-20050316
-lovely.remotetask = 0.5.2
-lxml = 2.2.4
-mechanize = 0.2.1
-mr.developer = 1.14
-py = 1.0.0
-python-gettext = 1.0
-pytz = 2010h
-roman = 1.4.0
-setuptools = 0.6c11
-tl.eggdeps = 0.4
-transaction = 1.0.1
-wsgi-intercept = 0.4
-z3c.checkversions = 0.2
-z3c.coverage = 1.2.0
-z3c.form = 2.3.4
-z3c.formui = 2.2.0
-z3c.macro = 1.2.1
-z3c.pt = 1.2.1
-z3c.ptcompat = 0.5.6
-z3c.recipe.compattest = 0.12.2
-z3c.recipe.depgraph = 0.5
-z3c.recipe.sphinxdoc = 0.0.8
-z3c.template = 1.2.1
-zc.buildout = 1.4.3
-zc.lockfile = 1.0.0
-zc.queue = 1.1
-zc.recipe.egg = 1.2.2
-zc.recipe.testrunner = 1.2.0
-zc.resourcelibrary = 1.3.1
-zc.sourcefactory = 0.6.0
-zc.table = 0.8.1
-zdaemon = 2.0.4
-zodbcode = 3.4.0
-zope.app.debugskin = 3.4.0
-zope.app.xmlrpcintrospection = 3.5.1
-zope.kgs = 1.2.0
-zope.mkzeoinstance = 3.9.4
-zope.modulealias = 3.4.0
-zope.rdb = 3.5.0
-zope.thread = 3.4
-zope.xmlpickle = 3.4.0
-
Deleted: zopetoolkit/branches/ccomb/extra.cfg
===================================================================
--- zopetoolkit/branches/ccomb/extra.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/extra.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -1,74 +0,0 @@
-# Copyright (c) 2010 Zope Foundation and Contributors.
-#
-# This is the specification file for the extra (or community) packages as defined
-# in http://docs.zope.org/zopetoolkit/
-# These packages are not officially supported.
-# This list allows community packages to be tested with the same infrastructure
-# as the ZTK, and to elect some of them to be included in the core.
-
-[buildout]
-parts =
- test-extra
- depgraph
- checkversions
-
-extensions = mr.developer
-# buildout.dumppickedversions
-allow-picked-versions = false
-
-extends =
- versions.cfg
-
-versions = versions
-
-[test-extra]
-recipe = z3c.recipe.compattest
-include = ${extra:packages}
-
-[depgraph]
-recipe = z3c.recipe.depgraph
-eggs = ${extra:packages}
-extras = True
-variants = base
- scc
-
-[checkversions]
-recipe = zc.recipe.egg
-eggs = z3c.checkversions [buildout]
-
-[extra]
-
-# the list of extra packages
-included =
- z3c.form
- z3c.formui
- lovely.remotetask
- zc.table
- zc.queue
-
-# the list of candidates for inclusion in the ZTK core
-candidates =
- zope.modulealias
- zope.xmlpickle
- zope.file
- zope.html
- zope.mimetype
- zope.testbrowser
-
-
-packages = ${extra:included}
- ${extra:candidates}
-
-
-[sources]
-lovely.remotetask = svn svn+ssh://svn.zope.org/repos/main/lovely.remotetask/trunk
-z3c.form = svn svn+ssh://svn.zope.org/repos/main/z3c.form/trunk
-z3c.formui = svn svn+ssh://svn.zope.org/repos/main/z3c.formui/trunk
-zc.table = svn svn+ssh://svn.zope.org/repos/main/zc.table/trunk
-zc.queue = svn svn+ssh://svn.zope.org/repos/main/zc.queue/trunk
-zope.modulealias = svn svn+ssh://svn.zope.org/repos/main/zope.modulealias/trunk
-zope.xmlpickle = svn svn+ssh://svn.zope.org/repos/main/zope.xmlpickle/trunk
-zope.file = svn svn+ssh://svn.zope.org/repos/main/zope.file/trunk
-zope.html = svn svn+ssh://svn.zope.org/repos/main/zope.html/trunk
-zope.mimetype = svn svn+ssh://svn.zope.org/repos/main/zope.mimetype/trunk
-zope.testbrowser = svn svn+ssh://svn.zope.org/repos/main/zope.testbrowser/branches/3.8
Modified: zopetoolkit/branches/ccomb/zopeapp-versions.cfg
===================================================================
--- zopetoolkit/branches/ccomb/zopeapp-versions.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/zopeapp-versions.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -1,4 +1,5 @@
[versions]
+# ZOPEAPP
zope.app.apidoc = 3.7.2
zope.app.applicationcontrol = 3.5.5
zope.app.appsetup = 3.14.0
@@ -31,7 +32,7 @@
zope.app.locking = 3.5.0
zope.app.onlinehelp = 3.5.2
zope.app.pagetemplate = 3.11.0
-zope.app.preference = 3.6.0
+zope.app.preference = 3.8.1
zope.app.preview = 3.4.0
zope.app.principalannotation = 3.7.0
zope.app.publication = 3.11.1
@@ -52,3 +53,10 @@
zope.app.zcmlfiles = 3.7.0
zope.app.zopeappgenerations = 3.5.0
zope.app.zptpage = 3.5.1
+roman = 1.4.0
+zc.sourcefactory = 0.6.0
+zodbcode = 3.4.0
+zope.preference = 3.8.0
+zope.thread = 3.4
+wsgi-intercept = 0.4
+zope.rdb = 3.5.0
Modified: zopetoolkit/branches/ccomb/zopeapp.cfg
===================================================================
--- zopetoolkit/branches/ccomb/zopeapp.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/zopeapp.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 Zope Foundation and Contributors.
+# Copyright (c) 2010 Zope Foundation and Contributors.
#
# This is the specification file for the transitional zope.app.* packages
@@ -61,10 +61,15 @@
# 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.
# (currently trunks, but should evolve to maintenance branches)
Modified: zopetoolkit/branches/ccomb/ztk-versions.cfg
===================================================================
--- zopetoolkit/branches/ccomb/ztk-versions.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/ztk-versions.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -69,3 +69,42 @@
zope.testing = 3.9.4
zope.traversing = 3.12.1
zope.viewlet = 3.7.2
+
+# Under review:
+
+zope.modulealias = 3.4.0
+zope.xmlpickle = 3.4.0
+
+# Dependencies:
+
+distribute = 0.6.13
+docutils = 0.6
+Jinja2 = 2.4.1
+mechanize = 0.2.1
+py = 1.0.0
+Pygments = 1.3.1
+python-gettext = 1.0
+pytz = 2010h
+RestrictedPython = 3.5.1
+setuptools = 0.6c11
+Sphinx = 0.6.5
+transaction = 1.0.1
+z3c.recipe.sphinxdoc = 0.0.8
+zc.buildout = 1.4.3
+zc.lockfile = 1.0.0
+ZConfig = 2.8.0
+zc.recipe.egg = 1.2.2
+zc.recipe.testrunner = 1.2.0
+zc.resourcelibrary = 1.3.1
+zdaemon = 2.0.4
+ZODB3 = 3.9.5
+zope.mkzeoinstance = 3.9.4
+
+# Not a dependency:
+
+lxml = 2.2.4
+
+# Other:
+
+zope.kgs = 1.2.0
+
Modified: zopetoolkit/branches/ccomb/ztk.cfg
===================================================================
--- zopetoolkit/branches/ccomb/ztk.cfg 2010-06-19 22:48:11 UTC (rev 113704)
+++ zopetoolkit/branches/ccomb/ztk.cfg 2010-06-19 23:05:35 UTC (rev 113705)
@@ -80,6 +80,12 @@
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)
More information about the checkins
mailing list