[Checkins] SVN: gocept.selenium/trunk/ Update and clean up extras_require, use it in the buildouts
Wolfgang Schnerring
wosc at wosc.de
Mon Dec 27 05:26:29 EST 2010
Log message for revision 119155:
Update and clean up extras_require, use it in the buildouts
Changed:
U gocept.selenium/trunk/common-zope210.cfg
U gocept.selenium/trunk/common.cfg
U gocept.selenium/trunk/grok.cfg
U gocept.selenium/trunk/plone.cfg
U gocept.selenium/trunk/plone4.cfg
U gocept.selenium/trunk/plonetesting-plone3.cfg
U gocept.selenium/trunk/plonetesting-plone4.cfg
U gocept.selenium/trunk/setup.py
U gocept.selenium/trunk/zope212.cfg
U gocept.selenium/trunk/ztk.cfg
-=-
Modified: gocept.selenium/trunk/common-zope210.cfg
===================================================================
--- gocept.selenium/trunk/common-zope210.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/common-zope210.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -6,7 +6,7 @@
recipe = plone.recipe.zope2instance
zope2-location = ${zope2:location}
user = admin:admin
-eggs = ${buildout:package}
+eggs = ${buildout:package} ${buildout:flavour}
[zope2]
recipe = plone.recipe.zope2install
Modified: gocept.selenium/trunk/common.cfg
===================================================================
--- gocept.selenium/trunk/common.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/common.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -3,9 +3,8 @@
develop = .
parts = test
package = gocept.selenium
+flavour =
[test]
recipe = zc.recipe.testrunner
-eggs = ${buildout:package}
-
-
+eggs = ${buildout:package} ${buildout:flavour}
\ No newline at end of file
Modified: gocept.selenium/trunk/grok.cfg
===================================================================
--- gocept.selenium/trunk/grok.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/grok.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -1,7 +1,7 @@
[buildout]
extends = common.cfg
http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
+flavour = [grok, test_grok]
[test]
-eggs = gocept.selenium[grok, test_grok]
defaults = ['--ignore_dir', 'wsgi', '--ignore_dir', 'ztk', '--ignore_dir', 'zope2', '--ignore_dir', 'plone', '--ignore_dir', 'static', '-v', '--auto-color']
Modified: gocept.selenium/trunk/plone.cfg
===================================================================
--- gocept.selenium/trunk/plone.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/plone.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -1,6 +1,7 @@
[buildout]
extends = common.cfg
common-zope210.cfg
+flavour = [plone, test_plone]
[versions]
zc.buildout = 1.4.3
@@ -12,7 +13,3 @@
zope2part = instance
defaults = --ignore_dir=ztk --ignore_dir=zope2 --ignore_dir=static --ignore_dir=plonetesting --tests-pattern=plone3
packages = ${buildout:package}
-
-[instance]
-eggs += Plone
- PILwoTK
Modified: gocept.selenium/trunk/plone4.cfg
===================================================================
--- gocept.selenium/trunk/plone4.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/plone4.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -1,8 +1,7 @@
[buildout]
extends = common.cfg
http://dist.plone.org/release/4.0-latest/versions.cfg
+flavour = [plone, test_plone]
[test]
defaults = ["--ignore_dir=ztk", "--ignore_dir=zope", "--ignore_dir=static", "--ignore_dir=plonetesting", "--tests-pattern=plone4"]
-eggs += Plone
- PILwoTK
Modified: gocept.selenium/trunk/plonetesting-plone3.cfg
===================================================================
--- gocept.selenium/trunk/plonetesting-plone3.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/plonetesting-plone3.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -1,6 +1,7 @@
[buildout]
extends = common.cfg
common-zope210.cfg
+flavour = [plonetesting, test_plonetesting]
[versions]
zope.testing = 3.9.5
@@ -12,10 +13,3 @@
[test]
defaults = ["--ignore_dir=zope2", "--tests-pattern=plone3", "--dir=gocept.selenium.plonetesting"]
extra-paths = ${zope2:location}/lib/python
-eggs = ${instance:eggs}
- plone.app.testing
-
-[instance]
-eggs += Plone
- PILwoTK
- plone.app.testing
Modified: gocept.selenium/trunk/plonetesting-plone4.cfg
===================================================================
--- gocept.selenium/trunk/plonetesting-plone4.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/plonetesting-plone4.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -1,6 +1,7 @@
[buildout]
extends = common.cfg
http://dist.plone.org/release/4.0-latest/versions.cfg
+flavour = [plonetesting, test_plonetesting]
[versions]
plone.testing = 4.0a3
@@ -8,6 +9,3 @@
[test]
defaults = ["--ignore_dir=zope2", "--tests-pattern=plone4", "--dir=gocept.selenium.plonetesting"]
-eggs += Plone
- PILwoTK
- plone.app.testing
Modified: gocept.selenium/trunk/setup.py
===================================================================
--- gocept.selenium/trunk/setup.py 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/setup.py 2010-12-27 10:26:29 UTC (rev 119155)
@@ -59,5 +59,24 @@
'zope.interface',
'zope.schema',
'ZODB3',
- ]),
+ ],
+ zope2=[ # Zope2>=2.12 is eggified
+ 'Zope2',
+ ],
+ plone=[
+ 'Products.PloneTestCase',
+ ],
+ test_plone=[
+ 'Plone',
+ 'PILwoTK',
+ ],
+ plonetesting=[
+ 'plone.testing',
+ ],
+ test_plonetesting=[
+ 'Plone',
+ 'PILwoTK',
+ 'plone.app.testing',
+ ],
+ ),
)
Modified: gocept.selenium/trunk/zope212.cfg
===================================================================
--- gocept.selenium/trunk/zope212.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/zope212.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -1,7 +1,7 @@
[buildout]
extends = common.cfg
http://dist.plone.org/release/4.0-latest/versions.cfg
+flavour = [zope2]
[test]
defaults = ["--ignore_dir=ztk", "--ignore_dir=plone", "--ignore_dir=static", "--tests-pattern=zope212"]
-eggs += Zope2
Modified: gocept.selenium/trunk/ztk.cfg
===================================================================
--- gocept.selenium/trunk/ztk.cfg 2010-12-27 10:21:10 UTC (rev 119154)
+++ gocept.selenium/trunk/ztk.cfg 2010-12-27 10:26:29 UTC (rev 119155)
@@ -2,7 +2,7 @@
extends = common.cfg
http://download.zope.org/zopetoolkit/index/1.0/ztk-versions.cfg
http://download.zope.org/zopetoolkit/index/1.0/zopeapp-versions.cfg
+flavour = [ztk, test_ztk]
[test]
-eggs = ${buildout:package} [ztk, test_ztk]
defaults = ['--ignore_dir', 'grok', '--ignore_dir', 'wsgi', '--ignore_dir', 'zope2', '--ignore_dir', 'plone', '--ignore_dir', 'static', '-v', '--auto-color']
More information about the checkins
mailing list