From 7e2ed7a57fb09ad04e8a807a88f048c2b5c60351 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 04:57:09 -0500 Subject: remove risky tag --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index e0954f19a..d55f14845 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -161,7 +161,7 @@ html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = dict( github_url='https://github.com/Pylons/pyramid', - in_progress='true' +# in_progress='true' ) # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths -- cgit v1.2.3 From b0238f6bdc8b957d2c9e7f9d2fc30d0e91dabf15 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 12:32:24 -0500 Subject: canary checkin to see if rtd will update --- TODO.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/TODO.txt b/TODO.txt index bdb258f04..b0d6c95bc 100644 --- a/TODO.txt +++ b/TODO.txt @@ -22,6 +22,7 @@ Must-Have - Fix deployment recipes in cookbook (discourage proxying without changing server). + Nice-to-Have ------------ -- cgit v1.2.3 From b39beb8e943f5be7bdf9c0e2d9fa82ceac59cfda Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 13:03:03 -0500 Subject: typo --- docs/whatsnew-1.3.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index 7b485a725..1d7ea1362 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -23,8 +23,8 @@ Pyramid no longer runs on Python 2.5. This includes the most recent release of Jython and the Python 2.5 version of Google App Engine. We could not easily "straddle" Python 2 and 3 versions and support Python 2 versions older than Python 2.6. You will need Python 2.6 or better to run this version of -Pyramid. If you need to use Pyramid on Python 2.5, you should use the most -recent 1.2.X release fo Pyramid there. +Pyramid. If you need to use Python 2.5, you should use the most recent 1.2.X +release of Pyramid. Though many Pyramid add-ons have releases which are already Python 3 compatible (in particular ``pyramid_debugtoolbar``, ``pyramid_jinja2``, -- cgit v1.2.3 From c54498c078d538b996bb38e9ebf3ac683559aa13 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Fri, 9 Dec 2011 12:04:18 -0600 Subject: typo --- docs/whatsnew-1.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index 1d7ea1362..678f08e2d 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -133,7 +133,7 @@ Minor Feature Additions - ``bpython`` interpreter compatibility in ``pshell``. See :ref:`ipython_or_bpython` for more information. -- Added :func:`pyramid.paster.get_appsettings`` API function. This function +- Added :func:`pyramid.paster.get_appsettings` API function. This function returns the settings defined within an ``[app:...]`` section in a PasteDeploy ``ini`` file. -- cgit v1.2.3 From ca602b62bcd5ab07abe2139565f62fecd8e3218c Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 13:17:50 -0500 Subject: fix template links --- docs/narr/MyProject/myproject/templates/mytemplate.pt | 12 ++++++------ .../alchemy/+package+/templates/mytemplate.pt_tmpl | 14 +++++++------- .../scaffolds/starter/+package+/templates/mytemplate.pt | 12 ++++++------ pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt | 12 ++++++------ 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index ab698123e..d20fc7efb 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -44,22 +44,22 @@ 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 diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl index 3cd9c66a4..7fc71113d 100644 --- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl @@ -32,7 +32,7 @@

    Search documentation

    -
    +
    @@ -44,22 +44,22 @@ 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 diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt index ab698123e..d20fc7efb 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt @@ -44,22 +44,22 @@ 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 diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt index ab698123e..d20fc7efb 100644 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt @@ -44,22 +44,22 @@ 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 2c3c28bbc9c1ce0410510e2acebdc778c67cc449 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 13:26:20 -0500 Subject: basic instructions --- pyramid/scaffolds/alchemy/README.txt_tmpl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pyramid/scaffolds/alchemy/README.txt_tmpl b/pyramid/scaffolds/alchemy/README.txt_tmpl index 40f98d14a..efea71c5c 100644 --- a/pyramid/scaffolds/alchemy/README.txt_tmpl +++ b/pyramid/scaffolds/alchemy/README.txt_tmpl @@ -1 +1,14 @@ {{project}} README +================== + +Getting Started +--------------- + +- cd + +- $venv/bin/python setup.py develop + +- $venv/bin/populate_{{project}} development.ini + +- $venv/bin/pserve development.ini + -- cgit v1.2.3 From 2f624f423bc1b087d92a4909b9859094d7e46cb8 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 14:18:47 -0500 Subject: bumped toolbar version --- docs/whatsnew-1.3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index 678f08e2d..3bb37dbf4 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -105,7 +105,7 @@ A configuration introspection system was added; see :ref:`using_introspection` and :ref:`introspection` for more information on using the introspection system as a developer. -The latest release of the pyramid debug toolbar (0.9.6) provides an +The latest release of the pyramid debug toolbar (0.9.7+) provides an "Introspection" panel that exposes introspection information to a Pyramid application developer. -- cgit v1.2.3 From 4250b64e8dd4406c3eab818bb873581823715dc2 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 14:28:59 -0500 Subject: fix links again --- docs/narr/MyProject/myproject/templates/mytemplate.pt | 4 ++-- pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl | 4 ++-- pyramid/scaffolds/starter/+package+/templates/mytemplate.pt | 4 ++-- pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/narr/MyProject/myproject/templates/mytemplate.pt b/docs/narr/MyProject/myproject/templates/mytemplate.pt index d20fc7efb..0bfac946e 100644 --- a/docs/narr/MyProject/myproject/templates/mytemplate.pt +++ b/docs/narr/MyProject/myproject/templates/mytemplate.pt @@ -47,13 +47,13 @@ Narrative Documentation
  • - API Documentation + API Documentation
  • Tutorials
  • - Change History + Change History
  • Sample Applications diff --git a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl index 7fc71113d..ac0140789 100644 --- a/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl +++ b/pyramid/scaffolds/alchemy/+package+/templates/mytemplate.pt_tmpl @@ -47,13 +47,13 @@ Narrative Documentation
  • - API Documentation + API Documentation
  • Tutorials
  • - Change History + Change History
  • Sample Applications diff --git a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt index d20fc7efb..0bfac946e 100644 --- a/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt +++ b/pyramid/scaffolds/starter/+package+/templates/mytemplate.pt @@ -47,13 +47,13 @@ Narrative Documentation
  • - API Documentation + API Documentation
  • Tutorials
  • - Change History + Change History
  • Sample Applications diff --git a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt index d20fc7efb..0bfac946e 100644 --- a/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt +++ b/pyramid/scaffolds/zodb/+package+/templates/mytemplate.pt @@ -47,13 +47,13 @@ Narrative Documentation
  • - API Documentation + API Documentation
  • Tutorials
  • - Change History + Change History
  • Sample Applications -- cgit v1.2.3 From 005e73ec6879359c9153e4de75f9c78591f96d9d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 14:51:10 -0500 Subject: mention setup.py develop failure on py32 --- docs/whatsnew-1.3.rst | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index 3bb37dbf4..5ec64088f 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -17,6 +17,16 @@ Python 3 Compatibility Pyramid is now Python 3 compatible. Python 3.2 or better is required. +.. warning:: + + As of this writing (the release of Pyramid 1.3a1), if you attempt to + install a Pyramid scaffold via ``setup.py develop`` on Python 3.2, it may + quit with an installation error while trying to install ``Pygments``. If + this happens, please rerun the ``setup.py develop`` command again and it + will complete. We're just as clueless as you are as to why this happens + at this point, but hopefully we'll figure it out before Pyramid 1.3 leaves + the alpha/beta phase. + This feature required us to make some compromises. Pyramid no longer runs on Python 2.5. This includes the most recent release -- cgit v1.2.3 From d214e4d9fd2ad8220c15453b2d8ea04e5c9808f4 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 14:59:56 -0500 Subject: be more specific --- docs/whatsnew-1.3.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst index 5ec64088f..bbf1d9842 100644 --- a/docs/whatsnew-1.3.rst +++ b/docs/whatsnew-1.3.rst @@ -20,12 +20,12 @@ Pyramid is now Python 3 compatible. Python 3.2 or better is required. .. warning:: As of this writing (the release of Pyramid 1.3a1), if you attempt to - install a Pyramid scaffold via ``setup.py develop`` on Python 3.2, it may - quit with an installation error while trying to install ``Pygments``. If - this happens, please rerun the ``setup.py develop`` command again and it - will complete. We're just as clueless as you are as to why this happens - at this point, but hopefully we'll figure it out before Pyramid 1.3 leaves - the alpha/beta phase. + install a Pyramid project that used ``alchemy`` scaffold via ``setup.py + develop`` on Python 3.2, it may quit with an installation error while + trying to install ``Pygments``. If this happens, please rerun the + ``setup.py develop`` command again and it will complete. We're just as + clueless as you are as to why this happens at this point, but hopefully + we'll figure it out before Pyramid 1.3 leaves the alpha/beta phase. This feature required us to make some compromises. -- cgit v1.2.3 From 5f1cf3fbc519085b93fb16a230c0637050ce350d Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Fri, 9 Dec 2011 15:04:49 -0500 Subject: prep for 1.3a1 --- CHANGES.txt | 4 ++-- docs/conf.py | 6 +++--- setup.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 4be846ece..9cdaac5be 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,5 +1,5 @@ -Next release -============ +1.3a1 (2011-12-09) +================== Features -------- diff --git a/docs/conf.py b/docs/conf.py index d55f14845..f913b2462 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -80,7 +80,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.3dev' +version = '1.3a1' # The full version, including alpha/beta/rc tags. release = version @@ -475,7 +475,7 @@ def resig(app, what, name, obj, options, signature, return_annotation): # -- Options for Epub output --------------------------------------------------- # Bibliographic Dublin Core info. -epub_title = 'The Pyramid Web Application Development Framework, Version 1.3dev' +epub_title = 'The Pyramid Web Application Development Framework, Version 1.3' epub_author = 'Chris McDonough' epub_publisher = 'Agendaless Consulting' epub_copyright = '2008-2011' @@ -492,7 +492,7 @@ epub_scheme = 'ISBN' epub_identifier = '0615445675' # A unique identification for the text. -epub_uid = 'The Pyramid Web Application Development Framework, Version 1.3dev' +epub_uid = 'The Pyramid Web Application Development Framework, Version 1.3' # HTML files that should be inserted before the pages created by sphinx. # The format is a list of tuples containing the path and title. diff --git a/setup.py b/setup.py index 4d3216e12..a09461303 100644 --- a/setup.py +++ b/setup.py @@ -56,7 +56,7 @@ if not PY3: ]) setup(name='pyramid', - version='1.3dev', + version='1.3a1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From d587b4b6974c2e4a9074f5bde42095227acfdd1c Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 10 Dec 2011 01:16:55 -0500 Subject: fix docs rendering --- pyramid/url.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyramid/url.py b/pyramid/url.py index 3f934b364..afb602d3a 100644 --- a/pyramid/url.py +++ b/pyramid/url.py @@ -191,10 +191,10 @@ class URLMethodsMixin(object): Calling ``request.route_path('route')`` is the same as calling ``request.route_url('route', _app_url=request.script_name)``. - :meth:`pyramid.request.Request.route_path` is, in fact, implemented - in terms of `:meth:`pyramid.request.Request.route_url` in just this - way. As a result, any ``_app_url`` passed within the ``**kw`` values - to ``route_path`` will be ignored. + :meth:`pyramid.request.Request.route_path` is, in fact, + implemented in terms of :meth:`pyramid.request.Request.route_url` + in just this way. As a result, any ``_app_url`` passed within the + ``**kw`` values to ``route_path`` will be ignored. """ kw['_app_url'] = self.script_name return self.route_url(route_name, *elements, **kw) -- cgit v1.2.3