Re: [Zope-dev] SVN: Zope/trunk/versions.cfg Group versions by the 'sets' to which they correspond.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tres Seaver wrote:
Log message for revision 111904: Group versions by the 'sets' to which they correspond.
Changed: U Zope/trunk/versions.cfg
-=- Modified: Zope/trunk/versions.cfg =================================================================== --- Zope/trunk/versions.cfg 2010-05-03 17:57:11 UTC (rev 111903) +++ Zope/trunk/versions.cfg 2010-05-04 01:49:24 UTC (rev 111904) @@ -2,39 +2,26 @@ versions = versions
[versions] +# Zope2-specific Zope2 = Acquisition = 2.13.3 -ClientForm = 0.2.10 DateTime = 2.12.1 -distribute = 0.6.10 -docutils = 0.6 ExtensionClass = 2.13.1 initgroups = 2.13.0 -Jinja2 = 2.3.1 -mechanize = 0.1.11 Missing = 2.13.0 MultiMapping = 2.13.0 Persistence = 2.13.1 -Pygments = 1.3.1 -python-gettext = 1.0 -pytz = 2010b Record = 2.13.0 RestrictedPython = 3.5.2 -Sphinx = 0.6.5 -setuptools= 0.6c11 tempstorage = 2.11.2 ThreadLock = 2.13.0 -tl.eggdeps = 0.4 -transaction = 1.0.0 -z3c.recipe.depgraph = 0.5 -zc.buildout = 1.4.3 -zc.lockfile = 1.0.0 -zc.recipe.egg = 1.2.2 -zc.recipe.testrunner = 1.2.0 -ZConfig = 2.8.0 -zdaemon = 2.0.4 -ZODB3 = 3.9.5 ZopeUndo = 2.12.0 + +# Zope2 dependencies +pytz = 2010b +docutils = 0.6 + +# ZTK zope.annotation = 3.5.0 zope.broken = 3.6.0 zope.browser = 1.3 @@ -75,3 +62,28 @@ zope.testing = 3.9.4 zope.traversing = 3.12.1 zope.viewlet = 3.7.1 + +# ZTK dependencies +mechanize = 0.1.11 +ClientForm = 0.2.10 + +# ZODB + dependencies +transaction = 1.0.0 +zc.lockfile = 1.0.0 +ZConfig = 2.8.0 +zdaemon = 2.0.4 +ZODB3 = 3.9.5 + +# toolchain +Jinja2 = 2.3.1 +Pygments = 1.3.1 +python-gettext = 1.0 +Sphinx = 0.6.5 +distribute = 0.6.10 +setuptools= 0.6c11 +tl.eggdeps = 0.4 +z3c.recipe.depgraph = 0.5 +zc.buildout = 1.4.3 +zc.recipe.egg = 1.2.2 +zc.recipe.testrunner = 1.2.0 +
Hanno, After splitting the Zope2 package versions up this way, it gets easier to see how they interact with the ones in ztk.cfg. I'm attaching a patch which adds back the 'extends = ' line, removes the versions from the ZTK and ZTK dependencies section which match, and adds comments for the overrides. If the Grok and BlueBream folks agree, then maybe we could just land all the versions currently in Zope2's versions.cfg, and have its overrides section be (temporarily, at least) empty. Tres. - -- =================================================================== Tres Seaver +1 540-429-0999 tseaver@palladion.com Palladion Software "Excellence by Design" http://palladion.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkvfgj4ACgkQ+gerLs4ltQ7lpwCeNrOs+Pbgr7GLxw9BWnoVJZqw qsAAn0CyaT/NXlMEEK9DDTFenfdljHnZ =weCU -----END PGP SIGNATURE-----
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Tres Seaver wrote:
Tres Seaver wrote:
Log message for revision 111904: Group versions by the 'sets' to which they correspond.
Changed: U Zope/trunk/versions.cfg
-=- Modified: Zope/trunk/versions.cfg =================================================================== --- Zope/trunk/versions.cfg 2010-05-03 17:57:11 UTC (rev 111903) +++ Zope/trunk/versions.cfg 2010-05-04 01:49:24 UTC (rev 111904) @@ -2,39 +2,26 @@ versions = versions
[versions] +# Zope2-specific Zope2 = Acquisition = 2.13.3 -ClientForm = 0.2.10 DateTime = 2.12.1 -distribute = 0.6.10 -docutils = 0.6 ExtensionClass = 2.13.1 initgroups = 2.13.0 -Jinja2 = 2.3.1 -mechanize = 0.1.11 Missing = 2.13.0 MultiMapping = 2.13.0 Persistence = 2.13.1 -Pygments = 1.3.1 -python-gettext = 1.0 -pytz = 2010b Record = 2.13.0 RestrictedPython = 3.5.2 -Sphinx = 0.6.5 -setuptools= 0.6c11 tempstorage = 2.11.2 ThreadLock = 2.13.0 -tl.eggdeps = 0.4 -transaction = 1.0.0 -z3c.recipe.depgraph = 0.5 -zc.buildout = 1.4.3 -zc.lockfile = 1.0.0 -zc.recipe.egg = 1.2.2 -zc.recipe.testrunner = 1.2.0 -ZConfig = 2.8.0 -zdaemon = 2.0.4 -ZODB3 = 3.9.5 ZopeUndo = 2.12.0 + +# Zope2 dependencies +pytz = 2010b +docutils = 0.6 + +# ZTK zope.annotation = 3.5.0 zope.broken = 3.6.0 zope.browser = 1.3 @@ -75,3 +62,28 @@ zope.testing = 3.9.4 zope.traversing = 3.12.1 zope.viewlet = 3.7.1 + +# ZTK dependencies +mechanize = 0.1.11 +ClientForm = 0.2.10 + +# ZODB + dependencies +transaction = 1.0.0 +zc.lockfile = 1.0.0 +ZConfig = 2.8.0 +zdaemon = 2.0.4 +ZODB3 = 3.9.5 + +# toolchain +Jinja2 = 2.3.1 +Pygments = 1.3.1 +python-gettext = 1.0 +Sphinx = 0.6.5 +distribute = 0.6.10 +setuptools= 0.6c11 +tl.eggdeps = 0.4 +z3c.recipe.depgraph = 0.5 +zc.buildout = 1.4.3 +zc.recipe.egg = 1.2.2 +zc.recipe.testrunner = 1.2.0 +
Hanno,
After splitting the Zope2 package versions up this way, it gets easier to see how they interact with the ones in ztk.cfg. I'm attaching a patch which adds back the 'extends = ' line, removes the versions from the ZTK and ZTK dependencies section which match, and adds comments for the overrides. If the Grok and BlueBream folks agree, then maybe we could just land all the versions currently in Zope2's versions.cfg, and have its overrides section be (temporarily, at least) empty.
Should the triumvirs so decide, attached is the patch for zopetoolkit which adopts the versions from Zope2. The "normal" buildout (using eggs rather than checkouts) passes all test-ztk and test-zopeapp tests with this patch applied. Tres. - -- =================================================================== Tres Seaver +1 540-429-0999 tseaver@palladion.com Palladion Software "Excellence by Design" http://palladion.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEUEARECAAYFAkvfhaMACgkQ+gerLs4ltQ7nngCgxvf1leQxkvJRCCg6Z2c/QB9G EqgAmK8lQkJkYokzxaiyHUFtRyceaig= =esK4 -----END PGP SIGNATURE-----
On Tue, May 4, 2010 at 4:25 AM, Tres Seaver <tseaver@palladion.com> wrote:
Should the triumvirs so decide, attached is the patch for zopetoolkit which adopts the versions from Zope2. The "normal" buildout (using eggs rather than checkouts) passes all test-ztk and test-zopeapp tests with this patch applied.
As far as I understand the current process, you can just go ahead and update the ztk.cfg file, as long as all tests pass. Please do that. I will change the Zope 2 versions file once we started clarifying a few things on the release team. Hanno
participants (2)
-
Hanno Schlichting -
Tres Seaver