update inigo_buildout

update i18noverride update inigo_plone update inigo_policy update inigo_theme
inigoconsulting · Jul 2, 2014 · c846c7a · c846c7a
1 parent cbc9cb7
commit c846c7a
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 10 deletions.
diff --git a/inigo/templer/templates/inigo_buildout/buildout.cfg b/inigo/templer/templates/inigo_buildout/buildout.cfg
@@ -7,7 +7,7 @@ parts =
     releaser
 
 extends =
-    http://dist.plone.org/release/4.3.1/versions.cfg
+    http://dist.plone.org/release/4.3.3/versions.cfg
     versions.cfg
 
 effective-user = 
@@ -38,7 +38,8 @@ recipe = plone.recipe.zope2instance
 eggs = 
     Plone
     Pillow
-    plone.app.dexterity [grok]
+    plone.app.dexterity [grok, relations]
+    five.pt
     ${buildout:policies}
 
 http-address = ${buildout:http-address}

diff --git a/inigo/templer/templates/inigo_buildout/deployment.cfg b/inigo/templer/templates/inigo_buildout/deployment.cfg
@@ -18,8 +18,7 @@ auto-checkout =
 sources = nosources
 
 [versions]
-docutils = 0.9.1
-Products.PloneHotfix20121106 = 1.2
+docutils = 0.11
 
 [nosources]
 
@@ -68,8 +67,9 @@ zcml-additional =
 http-address = ${site:instance2-host}:${site:instance2-port}
 
 [zeoserver]
-recipe = plone.recipe.zeoserver
+recipe = plone.recipe.zeoserver[zrs]
 zeo-address = ${site:zeoserver-address}
+replicate-to = ${site:zrs-address}
 zeo-log = ${buildout:log-directory}/${:_buildout_section_name_}.log
 file-storage = ${buildout:data-directory}/filestorage/Data.fs
 blob-storage = ${buildout:data-directory}/blobstorage/

diff --git a/inigo/templer/templates/inigo_buildout/site.cfg.sample b/inigo/templer/templates/inigo_buildout/site.cfg.sample
@@ -9,6 +9,7 @@ instance2-host = 127.0.0.1
 instance2-port = 8082
 
 zeoserver-address = 127.0.0.1:8100
+zrs-address = 127.0.0.1:5000
 
 haproxy-host = 127.0.0.1
 haproxy-port = 8080

diff --git a/inigo/templer/templates/inigo_buildout/versions.cfg b/inigo/templer/templates/inigo_buildout/versions.cfg
@@ -1,2 +1,3 @@
 [versions]
+plone.app.multilingual = 1.2
 
diff --git a/inigo/templer/templates/inigo_i18noverride/buildout.cfg_tmpl b/inigo/templer/templates/inigo_i18noverride/buildout.cfg_tmpl
@@ -1,6 +1,6 @@
 [buildout]
 #extensions = buildout.bootstrap mr.developer
-extends = http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
+extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.x.cfg
 package-name = ${namespace_package}.${package}
 parts = omelette scripts compile_po
 sources-dir = dev
@@ -13,6 +13,7 @@ find-links +=
 #inigo.templer = git https://github.com/inigoconsulting/inigo.templer.git
 
 [versions]
+plone.app.multilingual = 1.2
 inigo.templer = 1.4
 
 [test]

diff --git a/inigo/templer/templates/inigo_plone/+namespace_package+/+package+/configure.zcml_tmpl b/inigo/templer/templates/inigo_plone/+namespace_package+/+package+/configure.zcml_tmpl
@@ -15,6 +15,7 @@
 
     <include package=".behavior"/>
     <include package=".portlet"/>
+    <include package="five.pt"/>
 
     <browser:resourceDirectory 
         name="${namespace_package}.${package}"

diff --git a/inigo/templer/templates/inigo_plone/buildout.cfg_tmpl b/inigo/templer/templates/inigo_plone/buildout.cfg_tmpl
@@ -1,6 +1,6 @@
 [buildout]
 #extensions = buildout.bootstrap mr.developer
-extends = http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
+extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.x.cfg
 package-name = ${namespace_package}.${package}
 parts = omelette scripts
 sources-dir = dev
@@ -13,6 +13,7 @@ find-links +=
 #inigo.templer = git https://github.com/inigoconsulting/inigo.templer.git
 
 [versions]
+plone.app.multilingual = 1.2
 inigo.templer = 1.4
 
 [test]

diff --git a/inigo/templer/templates/inigo_plone/setup.py_tmpl b/inigo/templer/templates/inigo_plone/setup.py_tmpl
@@ -34,6 +34,7 @@ setup(name=${repr($project)},
           'plone.app.multilingual',
           'plone.multilingualbehavior',
           'plone.app.versioningbehavior',
+          'five.pt',
           # -*- Extra requirements: -*-
       ],
       extras_require={

diff --git a/inigo/templer/templates/inigo_policy/buildout.cfg_tmpl b/inigo/templer/templates/inigo_policy/buildout.cfg_tmpl
@@ -1,6 +1,6 @@
 [buildout]
 #extensions = buildout.bootstrap mr.developer
-extends = http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
+extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.x.cfg
 package-name = ${namespace_package}.${package}
 parts = omelette scripts
 sources-dir = dev
@@ -13,6 +13,7 @@ find-links +=
 #inigo.templer = git https://github.com/inigoconsulting/inigo.templer.git
 
 [versions]
+plone.app.multilingual = 1.2
 inigo.templer = 1.4
 
 [test]

diff --git a/inigo/templer/templates/inigo_theme/+namespace_package+/+package+/configure.zcml_tmpl b/inigo/templer/templates/inigo_theme/+namespace_package+/+package+/configure.zcml_tmpl
@@ -24,6 +24,7 @@
         name="${namespace_package}.${package}"
         directory="static"/>
 
+    <include package="five.pt" />
     <!-- -*- extra stuff goes here -*- -->
 
 </configure>
diff --git a/inigo/templer/templates/inigo_theme/buildout.cfg_tmpl b/inigo/templer/templates/inigo_theme/buildout.cfg_tmpl
@@ -1,6 +1,6 @@
 [buildout]
 #extensions = buildout.bootstrap mr.developer
-extends = http://svn.plone.org/svn/collective/buildout/plonetest/test-4.x.cfg
+extends = https://raw.githubusercontent.com/collective/buildout.plonetest/master/test-4.x.cfg
 package-name = ${namespace_package}.${package}
 parts = omelette scripts
 sources-dir = dev
@@ -13,6 +13,7 @@ find-links +=
 #inigo.templer = git https://github.com/inigoconsulting/inigo.templer.git
 
 [versions]
+plone.app.multilingual = 1.2
 inigo.templer = 1.4
 
 [test]

diff --git a/inigo/templer/templates/inigo_theme/setup.py_tmpl b/inigo/templer/templates/inigo_theme/setup.py_tmpl
@@ -33,7 +33,8 @@ setup(name=${repr($project)},
           'collective.dexteritytextindexer',
           'plone.app.multilingual',
           'plone.multilingualbehavior',
-          'z3c.jbot'
+          'z3c.jbot',
+          'five.pt',
           # -*- Extra requirements: -*-
       ],
       extras_require={