Changeset 11075

Timestamp:

12 Feb 2014, 17:12:11 (11 years ago)

Author:

uli

Message:

Plain transform of w.k. changes. Not the final one.

Location:

main/waeup.skeleton/branches/uli-diazo-themed

Files:

• CHANGES.txt (modified) (1 diff)
• buildout-zeo.cfg (modified) (4 diffs)
• buildout.cfg (modified) (7 diffs)
• etc/zdaemon.conf.in (modified) (1 diff)
• setup.py (modified) (3 diffs)
• versions.cfg (modified) (1 diff)

main/waeup.skeleton/branches/uli-diazo-themed/CHANGES.txt

@@ -1 +1 @@
 Changes
 *******
+1.0 (unreleased)
+================
+
+* Diazofied whole package.
+
 
 0.2 (unreleased)

main/waeup.skeleton/branches/uli-diazo-themed/buildout-zeo.cfg

@@ -13 +13 @@
     site_zcml
     zdaemon_conf
-    deploy_ini
-    debug_ini
+    raw_deploy_ini
+    raw_debug_ini
+    themed_deploy_ini
+    themed_debug_ini
     profile_ini
     zeo1_ini
@@ -23 +25 @@
 # kofactl creation must be _after_ app!
     kofactl
+    lxml
+    diazo
 # For backward compatibility, telling buildout not to throw away
 # the data and log subdirectories from the parts directory.
@@ -115 +119 @@
 # See http://pypi.python.org/pypi/zc.recipe.egg for details...
 recipe = zc.recipe.egg
-eggs = waeup.skeleton [beaker]
+eggs = waeup.skeleton [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zeo1.conf"
 scripts = kofactl=zeo_client1
@@ -122 +126 @@
 # See http://pypi.python.org/pypi/zc.recipe.egg for details...
 recipe = zc.recipe.egg
-eggs = waeup.skeleton [beaker]
+eggs = waeup.skeleton [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zeo2.conf"
 scripts = kofactl=zeo_client2

main/waeup.skeleton/branches/uli-diazo-themed/buildout.cfg

@@ -18 +18 @@
     site_zcml
     zdaemon_conf
-    deploy_ini
-    debug_ini
+    raw_deploy_ini
+    raw_debug_ini
+    themed_deploy_ini
+    themed_debug_ini
     profile_ini
     waeupdocs
@@ -26 +28 @@
 # kofactl creation must be _after_ app!
     kofactl
+    lxml
+    diazo
 # For backward compatibility, telling buildout not to throw away
 # the data and log subdirectories from the parts directory.
@@ -32 +36 @@
 # newest = false
 
-extends = versions.cfg
+extends =
+    http://good-py.appspot.com/release/diazo/1.0
+    versions.cfg
 show-picked-versions = true
 update-versions-file = versions.cfg
@@ -63 +69 @@
 # number of preopened paster threads, default 10
 threadpool_workers = 10
+devel_pkg = waeup.skeleton
 
 [app]
 # This creates all scripts in bin/. The kofactl created here is 'faulty'.
 recipe = zc.recipe.egg
-eggs = waeup.skeleton [beaker]
+eggs = waeup.skeleton [beaker, diazo]
        z3c.evalexception>=2.0
        Paste
@@ -81 +88 @@
 # fixed path to zdaemon.conf as argument.
 recipe = zc.recipe.egg
-eggs = waeup.skeleton [beaker]
+eggs = waeup.skeleton [beaker, diazo]
 arguments = "${buildout:parts-directory}/etc/zdaemon.conf"
 scripts = kofactl=kofactl
@@ -147 +154 @@
 output = ${buildout:parts-directory}/etc/zdaemon.conf
 
-[deploy_ini]
-recipe = collective.recipe.template
-input = etc/deploy.ini.in
-output = ${buildout:parts-directory}/etc/deploy.ini
-
-[debug_ini]
-recipe = collective.recipe.template
-input = etc/debug.ini.in
-output = ${buildout:parts-directory}/etc/debug.ini
+[raw_debug_ini]
+recipe = collective.recipe.template
+input = etc/raw/debug.ini.in
+output = ${buildout:parts-directory}/etc/raw-debug.ini
+
+[raw_deploy_ini]
+recipe = collective.recipe.template
+input = etc/raw/deploy.ini.in
+output = ${buildout:parts-directory}/etc/raw-deploy.ini
+
+[themed_debug_ini]
+recipe = collective.recipe.template
+input = etc/themed/debug.ini.in
+output = ${buildout:parts-directory}/etc/themed-debug.ini
+
+[themed_deploy_ini]
+recipe = collective.recipe.template
+input = etc/themed/deploy.ini.in
+output = ${buildout:parts-directory}/etc/themed-deploy.ini
 
 [profile_ini]
@@ -187 +204 @@
 scripts = coveragereport
 arguments = ('${buildout:parts-directory}/coverage-detect/working-directory/coverage', '${buildout:directory}/coverage-report')
+
+[lxml]
+recipe = z3c.recipe.staticlxml
+egg = lxml
+
+[diazo]
+recipe = zc.recipe.egg
+eggs =
+    diazo [wsgi]
+    PasteScript
+    waeup.skeleton [beaker, diazo]

main/waeup.skeleton/branches/uli-diazo-themed/etc/zdaemon.conf.in

@@ -1 +1 @@
 <runner>
-  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/deploy.ini
+  program ${buildout:directory}/bin/paster serve ${buildout:directory}/parts/etc/themed-deploy.ini
   daemon on
   transcript ${zope_conf:logfiles}/zdaemon.log

main/waeup.skeleton/branches/uli-diazo-themed/setup.py

@@ -2 +2 @@
 from setuptools import setup, find_packages
 
-version = '0.1dev'
+version = '0.2dev'
 
 install_requires = [
@@ -21 +21 @@
     'dolmen.beaker',
     ]
+
+diazo_require = [
+    'diazo',
+    'webob',
+]
 
 tests_require = [
@@ -86 +91 @@
         docs = docs_require,
         beaker = beaker_require,
+        diazo = diazo_require,
         ),
       entry_points="""

main/waeup.skeleton/branches/uli-diazo-themed/versions.cfg

@@ -128 +128 @@
 # zc.recipe.testrunner==2.0.0
 zope.testrunner = 4.3.3
+
+# Added by buildout at 2014-02-12 16:15:49.898520
+z3c.recipe.staticlxml = 0.10
+
+# Required by:
+# z3c.recipe.staticlxml==0.10
+zc.recipe.cmmi = 1.3.5