[Checkins] SVN: grok/branches/d2m-ztk-support/ remove grokdocs pinned versions, fix sphinx imports, fix jinja2 syntax

Michael Haubenwallner michael at d2m.at
Fri Nov 13 06:06:34 EST 2009


Log message for revision 105593:
  remove grokdocs pinned versions, fix sphinx imports, fix jinja2 syntax

Changed:
  U   grok/branches/d2m-ztk-support/buildout.cfg
  U   grok/branches/d2m-ztk-support/doc/layout.html
  U   grok/branches/d2m-ztk-support/grokdocs/setup.py
  U   grok/branches/d2m-ztk-support/grokdocs/src/grokdocs/latex_hacks.py

-=-
Modified: grok/branches/d2m-ztk-support/buildout.cfg
===================================================================
--- grok/branches/d2m-ztk-support/buildout.cfg	2009-11-13 10:41:33 UTC (rev 105592)
+++ grok/branches/d2m-ztk-support/buildout.cfg	2009-11-13 11:06:33 UTC (rev 105593)
@@ -1,7 +1,7 @@
 [buildout]
 extends = http://svn.zope.org/*checkout*/zopetoolkit/trunk/ztk.cfg?rev=105404
 parts =
-#    docs
+    docs
     interpreter
     grokwiki
     mkdirs
@@ -12,7 +12,7 @@
     bundlemaker
 develop =
     .
-#    grokdocs
+    grokdocs
     grokwiki
     grokcore.view
 versions = versions
@@ -31,9 +31,9 @@
 grokui.admin = 0.3.2
 martian = 0.11.1
 
-#[docs]
-#recipe = zc.recipe.egg
-#eggs = grokdocs
+[docs]
+recipe = zc.recipe.egg
+eggs = grokdocs
 
 [interpreter]
 recipe = zc.recipe.egg

Modified: grok/branches/d2m-ztk-support/doc/layout.html
===================================================================
--- grok/branches/d2m-ztk-support/doc/layout.html	2009-11-13 10:41:33 UTC (rev 105592)
+++ grok/branches/d2m-ztk-support/doc/layout.html	2009-11-13 11:06:33 UTC (rev 105593)
@@ -4,7 +4,7 @@
 {%- endblock %}
 {%- set reldelim1 = reldelim1 is not defined and ' »' or reldelim1 %}
 {%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- macro relbar %}
+{%- macro relbar() %}
     <div class="header">
         {%- block rootrellink %}
         <a href="{{ pathto('index') }}">Official Grok Documentation</a> version {{ release }}
@@ -25,7 +25,7 @@
     </div>
     </div>
 {%- endmacro %}
-{%- macro sidebar %}
+{%- macro sidebar() %}
       {%- if builder != 'htmlhelp' %}
       <div class="sphinxsidebar">
         <div class="sphinxsidebarwrapper">

Modified: grok/branches/d2m-ztk-support/grokdocs/setup.py
===================================================================
--- grok/branches/d2m-ztk-support/grokdocs/setup.py	2009-11-13 10:41:33 UTC (rev 105592)
+++ grok/branches/d2m-ztk-support/grokdocs/setup.py	2009-11-13 11:06:33 UTC (rev 105593)
@@ -9,9 +9,9 @@
     description="""\
 Grokdocs: Build the Grok documentation in different formats!
 """,
-    install_requires=['docutils==0.4',
-                      'Sphinx==0.4',
-                      'Pygments==0.8.1',
+    install_requires=['docutils',
+                      'Sphinx',
+                      'Pygments',
                       ],
     package_dir = {'': 'src'},
     packages=find_packages('src'),

Modified: grok/branches/d2m-ztk-support/grokdocs/src/grokdocs/latex_hacks.py
===================================================================
--- grok/branches/d2m-ztk-support/grokdocs/src/grokdocs/latex_hacks.py	2009-11-13 10:41:33 UTC (rev 105592)
+++ grok/branches/d2m-ztk-support/grokdocs/src/grokdocs/latex_hacks.py	2009-11-13 11:06:33 UTC (rev 105593)
@@ -21,7 +21,7 @@
 """
 
 from docutils import nodes
-from sphinx.latexwriter import LaTeXTranslator
+from sphinx.writers.latex import LaTeXTranslator
 
 # Inject a working pygments workaround.
 def depart_literal_block(self, node):



More information about the checkins mailing list