From 28cf6b65423b4c7e58afbf2850857a898dc29fbb Mon Sep 17 00:00:00 2001 From: goodwillcoding Date: Sat, 19 Apr 2014 21:26:05 -0700 Subject: Move the docs and pyramid version to scaffold template generation and out of the views. Add pyramid docs version to all the .ini file scaffolds Update alchemy, zodb, and starter to have respective names --- pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 8 ++++---- pyramid/scaffolds/alchemy/+package+/views.py_tmpl | 6 +----- pyramid/scaffolds/alchemy/development.ini_tmpl | 4 ++-- pyramid/scaffolds/alchemy/production.ini_tmpl | 4 ++-- pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl | 4 ++-- pyramid/scaffolds/starter/+package+/views.py_tmpl | 5 +---- pyramid/scaffolds/starter/development.ini_tmpl | 6 +++--- pyramid/scaffolds/starter/production.ini_tmpl | 4 ++-- pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl | 8 ++++---- pyramid/scaffolds/zodb/development.ini_tmpl | 4 ++-- pyramid/scaffolds/zodb/production.ini_tmpl | 4 ++-- 11 files changed, 25 insertions(+), 32 deletions(-) diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl index 5f860da26..83a9430b8 100644 --- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl @@ -8,7 +8,7 @@ - Starter Template for The Pyramid Web Framework + Alchemy Template for The Pyramid Web Framework @@ -33,7 +33,7 @@
-

Pyramid starter template

+

Pyramid alchemy template

Welcome to ${project}, an application generated by
the Pyramid Web Framework.

@@ -41,8 +41,8 @@
    -
  • Currently v${pyramid_version}
    • -
  • Docs
    • +
  • Currently v{{pyramid_version}}
    • +
  • Docs
  • Github Project
  • IRC Channel
  • Pylons Project
    • diff --git a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl index 15e695d94..292bce579 100644 --- a/pyramid/scaffolds/alchemy/+package+/views.py_tmpl +++ b/pyramid/scaffolds/alchemy/+package+/views.py_tmpl @@ -15,11 +15,7 @@ def my_view(request): one = DBSession.query(MyModel).filter(MyModel.name == 'one').first() except DBAPIError: return Response(conn_err_msg, content_type='text/plain', status_int=500) - return { - 'one': one, - 'project': '{{project}}', - 'pyramid_version': '{{pyramid_version}}', - 'pyramid_docs_branch': '{{pyramid_docs_branch}}'} + return {'one': one, 'project': '{{project}}'} conn_err_msg = """\ diff --git a/pyramid/scaffolds/alchemy/development.ini_tmpl b/pyramid/scaffolds/alchemy/development.ini_tmpl index bdf08171c..e54a8609c 100644 --- a/pyramid/scaffolds/alchemy/development.ini_tmpl +++ b/pyramid/scaffolds/alchemy/development.ini_tmpl @@ -1,6 +1,6 @@ ### # app configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html ### [app:main] @@ -32,7 +32,7 @@ port = 6543 ### # logging configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html ### [loggers] diff --git a/pyramid/scaffolds/alchemy/production.ini_tmpl b/pyramid/scaffolds/alchemy/production.ini_tmpl index 69b08e458..b316ec9ca 100644 --- a/pyramid/scaffolds/alchemy/production.ini_tmpl +++ b/pyramid/scaffolds/alchemy/production.ini_tmpl @@ -1,6 +1,6 @@ ### # app configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html ### [app:main] @@ -23,7 +23,7 @@ port = 6543 ### # logging configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html ### [loggers] diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl index 5f860da26..1272d187d 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt_tmpl @@ -41,8 +41,8 @@
      -
    • Currently v${pyramid_version}
      • -
    • Docs
      • +
    • Currently v{{pyramid_version}}
      • +
    • Docs
    • Github Project
    • IRC Channel
    • Pylons Project
      • diff --git a/pyramid/scaffolds/starter/+package+/views.py_tmpl b/pyramid/scaffolds/starter/+package+/views.py_tmpl index b7a50929c..ad9af7292 100644 --- a/pyramid/scaffolds/starter/+package+/views.py_tmpl +++ b/pyramid/scaffolds/starter/+package+/views.py_tmpl @@ -3,7 +3,4 @@ from pyramid.view import view_config @view_config(route_name='home', renderer='templates/mytemplate.pt') def my_view(request): - return { - 'project': '{{project}}', - 'pyramid_version': '{{pyramid_version}}', - 'pyramid_docs_branch': '{{pyramid_docs_branch}}'} + return {'project': '{{project}}'} diff --git a/pyramid/scaffolds/starter/development.ini_tmpl b/pyramid/scaffolds/starter/development.ini_tmpl index 33c454086..842cd61d9 100644 --- a/pyramid/scaffolds/starter/development.ini_tmpl +++ b/pyramid/scaffolds/starter/development.ini_tmpl @@ -1,6 +1,6 @@ ### # app configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html ### [app:main] @@ -11,7 +11,7 @@ pyramid.debug_authorization = false pyramid.debug_notfound = false pyramid.debug_routematch = false pyramid.default_locale_name = en -pyramid.includes = +pyramid.includes = pyramid_debugtoolbar # By default, the toolbar only appears for clients from IP addresses @@ -29,7 +29,7 @@ port = 6543 ### # logging configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html ### [loggers] diff --git a/pyramid/scaffolds/starter/production.ini_tmpl b/pyramid/scaffolds/starter/production.ini_tmpl index dd2637e5b..6a123abf5 100644 --- a/pyramid/scaffolds/starter/production.ini_tmpl +++ b/pyramid/scaffolds/starter/production.ini_tmpl @@ -1,6 +1,6 @@ ### # app configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html ### [app:main] @@ -23,7 +23,7 @@ port = 6543 ### # logging configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html ### [loggers] diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl index 76451f9b5..88a094fd9 100644 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt_tmpl @@ -8,7 +8,7 @@ - Starter Template for The Pyramid Web Framework + Starter ZODB Template for The Pyramid Web Framework @@ -33,7 +33,7 @@
    -

    Pyramid starter template

    +

    Pyramid ZODB template

    Welcome to ${project}, an application generated by
    the Pyramid Web Framework.

    @@ -41,8 +41,8 @@
      -
    • Currently v1.5
      • -
    • Docs
      • +
    • Currently v{{pyramid_version}}
      • +
    • Docs
    • Github Project
    • IRC Channel
    • Pylons Project
      • diff --git a/pyramid/scaffolds/zodb/development.ini_tmpl b/pyramid/scaffolds/zodb/development.ini_tmpl index 746f7ded3..f57d559bf 100644 --- a/pyramid/scaffolds/zodb/development.ini_tmpl +++ b/pyramid/scaffolds/zodb/development.ini_tmpl @@ -1,6 +1,6 @@ ### # app configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html ### [app:main] @@ -34,7 +34,7 @@ port = 6543 ### # logging configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html ### [loggers] diff --git a/pyramid/scaffolds/zodb/production.ini_tmpl b/pyramid/scaffolds/zodb/production.ini_tmpl index 9ce639ec3..c231e159d 100644 --- a/pyramid/scaffolds/zodb/production.ini_tmpl +++ b/pyramid/scaffolds/zodb/production.ini_tmpl @@ -1,6 +1,6 @@ ### # app configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/environment.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/environment.html ### [app:main] @@ -29,7 +29,7 @@ port = 6543 ### # logging configuration -# http://docs.pylonsproject.org/projects/pyramid/en/latest/narr/logging.html +# http://docs.pylonsproject.org/projects/pyramid/en/{{pyramid_docs_branch}}/narr/logging.html ### [loggers] -- cgit v1.2.3