From 6362949e3cc96509cf020d5612998d61050a13fb Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 27 Dec 2010 17:25:18 -0500 Subject: Prep for 1.0a8. --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 7bcdf3a07..8c238cecd 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -76,7 +76,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0a7' +version = '1.0a8' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From 74c3c37843d769b39ad93b326e5e154ef0fd5f46 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 3 Jan 2011 15:47:39 -0500 Subject: copyrights --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 8c238cecd..d69936cf8 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -426,7 +426,7 @@ def setup(app): epub_title = 'The Pyramid Web Application Development Framework, Version 1.0' epub_author = 'Chris McDonough' epub_publisher = 'Agendaless Consulting' -epub_copyright = '2008-2010' +epub_copyright = '2008-2011' # The language of the text. It defaults to the language option # or en if the language is not set. -- cgit v1.2.3 From be5f12ca5624130e6a61297d4c944cc65f757f52 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 7 Jan 2011 15:59:37 -0500 Subject: preserve method signatures of @action_method-decorated methods in sphinx docs --- docs/conf.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index d69936cf8..2f4c5227a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -13,6 +13,7 @@ import sys, os import datetime +import inspect import warnings warnings.simplefilter('ignore', DeprecationWarning) @@ -407,6 +408,18 @@ def setup(app): app.add_directive('frontmatter', frontmatter, 1, (0, 0, 0)) app.add_directive('mainmatter', mainmatter, 1, (0, 0, 0)) app.add_directive('backmatter', backmatter, 1, (0, 0, 0)) + app.connect('autodoc-process-signature', resig) + +def resig(app, what, name, obj, options, signature, return_annotation): + """ Allow for preservation of ``@action_method`` decorated methods + in configurator """ + docobj = getattr(obj, '__docobj__', None) + if docobj is not None: + argspec = inspect.getargspec(docobj) + if argspec[0] and argspec[0][0] in ('cls', 'self'): + del argspec[0][0] + signature = inspect.formatargspec(*argspec) + return signature, return_annotation # turn off all line numbers in latex formatting -- cgit v1.2.3 From a063aff1b0a9fe1f9d8c4a4baeade6453695f171 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 8 Jan 2011 00:46:32 -0500 Subject: prep for 1.0a9 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 2f4c5227a..aa7cb7d1e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -77,7 +77,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0a8' +version = '1.0a9' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From 079bb25384a6c7dff3acc7c0340a52adeb645c90 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 18 Jan 2011 15:14:40 -0500 Subject: prep for 1.0a10 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index aa7cb7d1e..dce4ef879 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -77,7 +77,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0a9' +version = '1.0a10' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From 8864e043a683f22f5ec316f17a146fedaa3373da Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 21 Jan 2011 13:03:29 -0500 Subject: depend on intersphinx to point at Mako i18n recipe --- docs/conf.py | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index dce4ef879..e48af3cbc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -57,8 +57,24 @@ for item in os.listdir(parent): # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', - 'repoze.sphinx.autointerface'] +extensions = [ + 'sphinx.ext.autodoc', + 'sphinx.ext.doctest', + 'repoze.sphinx.autointerface', + 'sphinx.ext.intersphinx' + ] + +# Looks for objects in other Pyramid projects +intersphinx_mapping = { + 'cookbook': + ('http://docs.pylonsproject.org/projects/pyramid_cookbook/dev/', None), + 'handlers': + ('http://docs.pylonsproject.org/projects/pyramid_handlers/dev/', None), + 'zcml': + ('http://docs.pylonsproject.org/projects/pyramid_zcml/dev/', None), + 'jinja2': + ('http://docs.pylonsproject.org/projects/pyramid_jinja2/dev/', None), + } # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] -- cgit v1.2.3 From a44845ef92567c90ba8d163f0cb5203151243001 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 21 Jan 2011 21:56:04 -0500 Subject: prep for 1.0b1 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index e48af3cbc..19ba5546b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0a10' +version = '1.0b1' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From 237bf1a37bb36d0ef37aa068a2d35b7f69ce92f1 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 24 Jan 2011 22:23:06 -0500 Subject: prep for 1.0b2 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 19ba5546b..fe28bacdf 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0b1' +version = '1.0b2' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From c61cd1070614fd88f217359ddca448773266edd8 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 28 Jan 2011 11:12:04 -0500 Subject: prep for 1.0b3 --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index fe28bacdf..d623a6323 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0b2' +version = '1.0b3' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From 288072c4b28789a7d599d2d224ada5e18a57abd7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 30 Jan 2011 18:33:56 -0500 Subject: we no longer use intersphinx --- docs/conf.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index d623a6323..7c6cc452e 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -61,20 +61,20 @@ extensions = [ 'sphinx.ext.autodoc', 'sphinx.ext.doctest', 'repoze.sphinx.autointerface', - 'sphinx.ext.intersphinx' +# 'sphinx.ext.intersphinx' ] # Looks for objects in other Pyramid projects -intersphinx_mapping = { - 'cookbook': - ('http://docs.pylonsproject.org/projects/pyramid_cookbook/dev/', None), - 'handlers': - ('http://docs.pylonsproject.org/projects/pyramid_handlers/dev/', None), - 'zcml': - ('http://docs.pylonsproject.org/projects/pyramid_zcml/dev/', None), - 'jinja2': - ('http://docs.pylonsproject.org/projects/pyramid_jinja2/dev/', None), - } +## intersphinx_mapping = { +## 'cookbook': +## ('http://docs.pylonsproject.org/projects/pyramid_cookbook/dev/', None), +## 'handlers': +## ('http://docs.pylonsproject.org/projects/pyramid_handlers/dev/', None), +## 'zcml': +## ('http://docs.pylonsproject.org/projects/pyramid_zcml/dev/', None), +## 'jinja2': +## ('http://docs.pylonsproject.org/projects/pyramid_jinja2/dev/', None), +## } # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] @@ -93,7 +93,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.0b3' +version = '1.0' # The full version, including alpha/beta/rc tags. release = version -- cgit v1.2.3 From 5236f382ebc58f4b46f273c034449664d198fce0 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 30 Jan 2011 18:36:28 -0500 Subject: use the right isbn --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/conf.py') diff --git a/docs/conf.py b/docs/conf.py index 7c6cc452e..a987106d4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -466,7 +466,7 @@ epub_scheme = 'ISBN' # The unique identifier of the text. This can be a ISBN number # or the project homepage. -epub_identifier = '0615345379' +epub_identifier = '0615445675' # A unique identification for the text. epub_uid = 'The Pyramid Web Application Development Framework, Version 1.0' -- cgit v1.2.3