-----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          tsea...@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-----
=== modified file 'versions.cfg'
--- versions.cfg	2010-05-04 01:30:19 +0000
+++ versions.cfg	2010-05-04 02:08:13 +0000
@@ -1,5 +1,6 @@
 [buildout]
 versions = versions
+extends = http://svn.zope.org/repos/main/zopetoolkit/trunk/ztk.cfg
 
 [versions]
 # Zope2-specific
@@ -21,51 +22,36 @@
 pytz = 2010b
 docutils = 0.6
 
-# ZTK
-zope.annotation = 3.5.0
-zope.broken = 3.6.0
-zope.browser = 1.3
-zope.browsermenu = 3.9.1
-zope.browserpage = 3.12.1
-zope.browserresource = 3.10.3
-zope.component = 3.9.4
-zope.configuration = 3.7.2
-zope.container = 3.11.1
-zope.contentprovider = 3.7.1
-zope.contenttype = 3.5.1
-zope.datetime = 3.4.0
-zope.deferredimport = 3.5.1
-zope.dottedname = 3.4.6
-zope.event = 3.4.1
-zope.exceptions = 3.6.0
-zope.filerepresentation = 3.6.0
-zope.i18n = 3.7.3
-zope.i18nmessageid = 3.5.2
-zope.interface = 3.6.1
-zope.lifecycleevent = 3.6.1
-zope.location = 3.9.0
-zope.pagetemplate = 3.5.1
-zope.processlifetime = 1.0
-zope.proxy = 3.6.0
-zope.ptresource = 3.9.0
-zope.publisher = 3.12.3
-zope.schema = 3.6.3
-zope.security = 3.7.3
-zope.sendmail = 3.7.2
-zope.sequencesort = 3.4.0
-zope.site = 3.9.1
-zope.size = 3.4.1
-zope.structuredtext = 3.5.0
-zope.tal = 3.5.2
-zope.tales = 3.5.1
-zope.testbrowser = 3.8.1
-zope.testing = 3.9.4
-zope.traversing = 3.12.1
-zope.viewlet = 3.7.1
+# ZTK (only deltas from the one we extend)
+zope.browser = 1.3                  # ztk:  1.2
+zope.browsermenu = 3.9.1            # ztk:  3.9.0
+zope.browserpage = 3.12.1           # ztk:  3.12.0
+zope.browserresource = 3.10.3       # ztk:  3.10.1
+zope.component = 3.9.4              # ztk:  3.9.4
+zope.configuration = 3.7.2          # ztk:  3.7.1
+zope.container = 3.11.1             # ztk:  3.11.0
+zope.contentprovider = 3.7.1        # ztk:  3.7
+zope.deferredimport = 3.5.1         # ztk:  3.5.0
+zope.exceptions = 3.6.0             # ztk:  3.5.2
+zope.i18n = 3.7.3                   # ztk:  3.7.3
+zope.i18nmessageid = 3.5.2          # ztk:  3.5.1
+zope.interface = 3.6.1              # ztk:  3.5.3
+zope.lifecycleevent = 3.6.1         # ztk:  3.6.0
+zope.pagetemplate = 3.5.1           # ztk:  3.5.0
+zope.proxy = 3.6.0                  # ztk:  3.6.0
+zope.publisher = 3.12.3             # ztk:  3.12.2
+zope.schema = 3.6.3                 # ztk:  3.6.1
+zope.security = 3.7.3               # ztk:  3.7.2
+zope.sendmail = 3.7.2               # ztk:  3.7.1
+zope.site = 3.9.1                   # ztk:  3.9.0
+zope.structuredtext = 3.5.0         # ztk:  3.4.0
+zope.tales = 3.5.1                  # ztk:  3.5.1
+zope.testbrowser = 3.8.1            # ztk:  3.7.0
+zope.testing = 3.9.4                # ztk:  3.8.7
+zope.traversing = 3.12.1            # ztk:  3.12.0
+zope.viewlet = 3.7.1                # ztk:  3.7.0
 
 # ZTK dependencies
-mechanize = 0.1.11
-ClientForm = 0.2.10
 
 # ZODB + dependencies
 transaction = 1.0.0

_______________________________________________
Zope-Dev maillist  -  Zope-Dev@zope.org
https://mail.zope.org/mailman/listinfo/zope-dev
**  No cross posts or HTML encoding!  **
(Related lists - 
 https://mail.zope.org/mailman/listinfo/zope-announce
 https://mail.zope.org/mailman/listinfo/zope )

Reply via email to