From f52d595bd1cef5cb97d440c8ba1b1a9850ec8f4b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 12 Jan 2011 02:36:10 -0500 Subject: Features -------- - ``pyramid.testing.setUp`` and ``pyramid.testing.tearDown`` have been undeprecated. They are now the canonical setup and teardown APIs for test configuration, replacing "direct" creation of a Configurator. This is a change designed to provide a facade that will protect against any future Configurator deprecations. Paster Templates ---------------- - All paster templates now use ``pyramid.testing.setUp`` and ``pyramid.testing.tearDown`` rather than creating a Configurator "by hand" within their ``tests.py`` module, as per decision in features above. Documentation ------------- - The wiki and wiki2 tutorials now use ``pyramid.testing.setUp`` and ``pyramid.testing.tearDown`` rather than creating a Configurator "by hand", as per decision in features above. - The "Testing" narrative chapter now explains ``pyramid.testing.setUp`` and ``pyramid.testing.tearDown`` instead of Configurator creation and ``Configurator.begin()`` and ``Configurator.end()``. --- docs/narr/MyProject/myproject/tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/myproject/tests.py b/docs/narr/MyProject/myproject/tests.py index b14fb37af..5fa710278 100644 --- a/docs/narr/MyProject/myproject/tests.py +++ b/docs/narr/MyProject/myproject/tests.py @@ -1,15 +1,13 @@ import unittest -from pyramid.config import Configurator from pyramid import testing class ViewTests(unittest.TestCase): def setUp(self): - self.config = Configurator(autocommit=True) - self.config.begin() + self.config = testing.setUp() def tearDown(self): - self.config.end() + testing.tearDown() def test_my_view(self): from myproject.views import my_view -- cgit v1.2.3 From e7b5fe05297d46cc169bd2f255529952569d899c Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:07:54 -0500 Subject: Changed some references from pylonshq.com to pylonsproject.org --- docs/narr/MyProject/myproject/templates/mytemplate.pt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 02fc00eeb..ec22ef396 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -32,7 +32,7 @@

Search documentation

-
+
@@ -41,25 +41,25 @@

Pyramid links

  • - Pylons Website + Pylons Website
  • - Narrative Documentation + Narrative Documentation
  • - API Documentation + API Documentation
  • - Tutorials + Tutorials
  • - Change History + Change History
  • - Sample Applications + Sample Applications
  • - Support and Development + Support and Development
  • IRC Channel -- cgit v1.2.3 From dd4a6e7635c497c20c4a361aad95a955bf2c9b3e Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:25:04 -0500 Subject: Changed google font link and use request.static_url in myproject --- docs/narr/MyProject/myproject/templates/mytemplate.pt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index ec22ef396..165ef9c0b 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -5,19 +5,18 @@ - - - - + + +
    -
    pyramid
    +
    pyramid
    -- cgit v1.2.3 From ec99888c9c15f1ee17157d252ef64ed161042129 Mon Sep 17 00:00:00 2001 From: Blaise Laflamme Date: Wed, 12 Jan 2011 23:43:06 -0500 Subject: Reformatted myproject mytemplate.pt --- .../MyProject/myproject/templates/mytemplate.pt | 171 ++++++++++++--------- 1 file changed, 101 insertions(+), 70 deletions(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 165ef9c0b..0bfea9d53 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -1,75 +1,106 @@ - - + + - The Pyramid Web Application Development Framework - - - - - - - + The Pyramid Web Application Development Framework + + + + + + + -
    -
    -
    -
    pyramid
    -
    -
    -
    -
    -

    - Welcome to ${project}, an application generated by
    - the Pyramid web application development framework. -

    -
    -
    -
    -
    -
    -

    Search documentation

    -
    - - -
    -
    - -
    -
    -
    - +
    +
    +
    +
    + pyramid +
    +
    +
    +
    +
    +

    + Welcome to ${project}, + an application generated by
    + the Pyramid web application development framework. +

    +
    +
    + +
    + \ No newline at end of file -- cgit v1.2.3 From 43ab049020d000a84c86770e9782a9964ff4167d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 21 Jan 2011 01:50:46 -0500 Subject: deal with the addition of production.ini --- docs/narr/MyProject/development.ini | 7 ++++- docs/narr/MyProject/production.ini | 63 +++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 docs/narr/MyProject/production.ini (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini index 48fc81b8c..154e2c418 100644 --- a/docs/narr/MyProject/development.ini +++ b/docs/narr/MyProject/development.ini @@ -20,7 +20,7 @@ port = 6543 # Begin logging configuration [loggers] -keys = root +keys = root, myproject [handlers] keys = console @@ -32,6 +32,11 @@ keys = generic level = INFO handlers = console +[logger_myproject] +level = DEBUG +handlers = +qualname = myproject + [handler_console] class = StreamHandler args = (sys.stderr,) diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini new file mode 100644 index 000000000..c1d0eee82 --- /dev/null +++ b/docs/narr/MyProject/production.ini @@ -0,0 +1,63 @@ +[app:MyProject] +use = egg:MyProject +reload_templates = false +debug_authorization = false +debug_notfound = false +debug_routematch = false +debug_templates = false +default_locale_name = en + +[filter:weberror] +use = egg:WebError#error_catcher +debug = false +;error_log = +;show_exceptions_in_wsgi_errors = true +;smtp_server = localhost +;error_email = janitor@example.com +;smtp_username = janitor +;smtp_password = "janitor's password" +;from_address = paste@localhost +;error_subject_prefix = "Pyramid Error" +;smtp_use_tls = +;error_message = + +[pipeline:main] +pipeline = + weberror + MyProject + +[server:main] +use = egg:Paste#http +host = 0.0.0.0 +port = 6543 + +# Begin logging configuration + +[loggers] +keys = root, myproject + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = INFO +handlers = console + +[logger_myproject] +level = INFO +handlers = +qualname = myproject + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s + +# End logging configuration -- cgit v1.2.3 From 47442fb154eae5c6cd71a54e9b4aeee484e1c38b Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 21 Jan 2011 20:05:09 -0500 Subject: - Add a ``MANIFEST.in`` file to each paster template. See https://github.com/Pylons/pyramid/issues#issue/95 Closes issue #95. --- docs/narr/MyProject/MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 docs/narr/MyProject/MANIFEST.in (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/MANIFEST.in b/docs/narr/MyProject/MANIFEST.in new file mode 100644 index 000000000..304bd817c --- /dev/null +++ b/docs/narr/MyProject/MANIFEST.in @@ -0,0 +1,2 @@ +include *.txt *.ini *.cfg *.rst +recursive-include myproject *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js -- cgit v1.2.3 From 6abe4422f9a36b4c7f5f5a0dfcbf11f171f9f572 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 21 Jan 2011 21:29:06 -0500 Subject: include txt, mako, xml, html --- docs/narr/MyProject/MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/MANIFEST.in b/docs/narr/MyProject/MANIFEST.in index 304bd817c..fa1692163 100644 --- a/docs/narr/MyProject/MANIFEST.in +++ b/docs/narr/MyProject/MANIFEST.in @@ -1,2 +1,2 @@ include *.txt *.ini *.cfg *.rst -recursive-include myproject *.ico *.png *.css *.gif *.jpg *.pt *.mak *.js +recursive-include myproject *.ico *.png *.css *.gif *.jpg *.pt *.txt *.mak *.mako *.js *.html *.xml -- cgit v1.2.3 From bd330cfc22555ce0026b92d40091d0745b60e36c Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Tue, 25 Jan 2011 23:00:44 -0500 Subject: - Use © instead of copyright symbol in paster templates / tutorial templates for the benefit of folks who cutnpaste and save to a non-UTF8 format. --- docs/narr/MyProject/myproject/templates/mytemplate.pt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 0bfea9d53..03e7d9091 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -100,7 +100,7 @@
    - \ No newline at end of file + -- cgit v1.2.3 From edceab4f51d334c3c159a69ae9dd20c3a36be500 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 27 Jan 2011 22:31:26 -0500 Subject: this line is too long to fit in the book; cheat --- docs/narr/MyProject/development.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini index 154e2c418..29486ce56 100644 --- a/docs/narr/MyProject/development.ini +++ b/docs/narr/MyProject/development.ini @@ -44,6 +44,6 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s +format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s # End logging configuration -- cgit v1.2.3 From ed252c573f5470aef4f73227a5c516eace9474b5 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 28 Jan 2011 00:08:35 -0500 Subject: convert all tabs to spaces in templates (sorry, blaise, i may have to use an older version of sphinx which doesnt respect tab-width) --- .../MyProject/myproject/templates/mytemplate.pt | 184 ++++++++++----------- 1 file changed, 92 insertions(+), 92 deletions(-) (limited to 'docs/narr/MyProject') diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index 03e7d9091..632c34876 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -4,103 +4,103 @@ xml:lang="en" xmlns:tal="http://xml.zope.org/namespaces/tal"> - The Pyramid Web Application Development Framework - - - - - - - + The Pyramid Web Application Development Framework + + + + + + + -
    -
    -
    -
    - pyramid -
    -
    +
    +
    +
    +
    + pyramid
    -
    -
    -

    - Welcome to ${project}, - an application generated by
    - the Pyramid web application development framework. -

    -
    +
    +
    +
    +
    +

    + Welcome to ${project}, + an application generated by
    + the Pyramid web application development framework. +

    +
    +
    +
    +
    +
    +

    Search documentation

    +
    + + +
    -
    - +
    + -- cgit v1.2.3