-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hanno Schlichting wrote: > 2010/3/31 Tres Seaver <tsea...@palladion.com>: >> I believe the root of this problem is that the 'index' and 'versions' >> bits of a buildout.cfg are effectively Highlanders ("there can only be >> one"). I gave up on trying to get the "two, two, two Zopes in one" >> buildout to work, and instead created a separate buildout.cfg for >> running CMF's tests against Zope 2.12.3. > > Yeah, that sounds sensible. The extra test part with an index was a > hack in the first place. > >> Unless somebody objects violently, I plan to check the attached config >> in on a branch of the main CMF buildout, and rip out the stuff which >> tries to do both from the trunk version. This change will require >> Stefan's nightly runner to be adjusted, so I'm CC'ing him. > > Looks all good, except for this first line of comment, which should be > CMF trunk + Zope 2.12 :) > >> # CMF trunk + Zope trunk > > Personally I prefer versions.cfg files, so we could use an: > > extends = http://download.zope.org/Zope2/index/2.12.3/versions.cfg > > instead of the index = line. But I don't care much for this specific > test buildout.
OK, the change I'm planning on the trunk essentially reverts your last commit (all the extra version pins to make the 'test-zope212' part build), plus deleting the test-zope212 part (see attached patch). BTW, I think the other test buildouts which do not run aganst the Zope2 trunk should probably also be adjusted to use released Zope 2.12.x eggs as well: we aren't co-developing the Zope 2.12 branch along with CMF 2.2 (any more, at least). I also don't know why the 'instance' and 'i18n*' parts are configured in these buildouts -- does somebody have a memory of why, or a reason to keep them? 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 iEYEARECAAYFAkuzlXcACgkQ+gerLs4ltQ6GtgCePELI/PiWKI71CESkmn6ybLou YFgAoJHrg5d2A4wTIsc1jeh8UjUqCqOD =N8Fu -----END PGP SIGNATURE-----
Index: buildout.cfg =================================================================== --- buildout.cfg (revision 110373) +++ buildout.cfg (working copy) @@ -1,15 +1,12 @@ # CMF trunk + Zope trunk [buildout] -extensions = buildout.dumppickedversions - extends = src/Zope2/versions.cfg parts = zope2 instance zopepy test - test-zope212 i18n-cmfcalendar i18n-cmfdefault eggs = @@ -34,39 +31,10 @@ src/five.localsitemanager [versions] -# Override of a Zope2 trunk version pin -zope.sendmail = 3.5.1 -# CMF-only dependencies five.formlib = 1.0.2 -plone.recipe.zope2instance = 4.0a4 -z3c.recipe.i18n = 0.7.0 -zope.authentication = 3.7.0 -zope.cachedescriptors = 3.5.0 -zope.componentvocabulary = 1.0 -zope.copy = 3.5.0 -zope.copypastemove = 3.5.2 -zope.deprecation = 3.4.0 -zope.dublincore = 3.4.3 -zope.error = 3.6.0 +plone.recipe.zope2instance = 4.0a1 zope.formlib = 3.10.0 -zope.hookable = 3.4.1 -zope.minmax = 1.1.1 -zope.password = 3.5.1 -zope.session = 3.9.2 -zope.app.applicationcontrol = 3.5.0 -zope.app.appsetup = 3.11 -zope.app.component = 3.8.3 -zope.app.container = 3.8.0 -zope.app.debug = 3.4.1 -zope.app.dependable = 3.4.0 zope.app.form = 3.12.1 -zope.app.locales = 3.5.1 -zope.app.pagetemplate = 3.7.1 -zope.app.publication = 3.7.0 -zope.app.publisher = 3.8.3 -zope.app.schema = 3.5.0 -zope.app.testing = 3.6.2 -zLOG = 2.11.1 [zope2] recipe = zc.recipe.egg @@ -91,14 +59,6 @@ eggs = ${buildout:eggs} defaults = ['--module', '^Products[.](CMF|DC|GenericSetup)|^five[.]'] -[test-zope212] -recipe = zc.recipe.testrunner -index = http://download.zope.org/Zope2/index/2.12.3/ -eggs = - Zope2 == 2.12.3 - ${buildout:eggs} -defaults = ['--module', '^Products[.](CMF|DC|GenericSetup)|^five[.]'] - [i18n-cmfcalendar] recipe = z3c.recipe.i18n:i18n eggs =
_______________________________________________ Zope-CMF maillist - Zope-CMF@zope.org https://mail.zope.org/mailman/listinfo/zope-cmf See https://bugs.launchpad.net/zope-cmf/ for bug reports and feature requests