From ce1e86c44e812ae438c2647cd7d5b6a4ce2ab478 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 16 Sep 2012 23:15:45 -0400 Subject: prep for 1.4a1 --- CHANGES.txt | 5 ++--- docs/conf.py | 2 +- setup.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 66ac42136..592b08448 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,5 @@ -Next release -============ - +1.4a1 (2012-09-16) +================== Bug Fixes --------- diff --git a/docs/conf.py b/docs/conf.py index 80ee0d2e5..65d1cb83b 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -81,7 +81,7 @@ copyright = '%s, Agendaless Consulting' % datetime.datetime.now().year # other places throughout the built documents. # # The short X.Y version. -version = '1.4dev' +version = '1.4a1' # The full version, including alpha/beta/rc tags. release = version diff --git a/setup.py b/setup.py index 03ebb4293..bb0bf45a7 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.4dev', + version='1.4a1', description=('The Pyramid web application development framework, a ' 'Pylons project'), long_description=README + '\n\n' + CHANGES, -- cgit v1.2.3 From 0583963c30caa1e12a9fc9a3a69830f5b50f40e7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 16 Sep 2012 23:20:59 -0400 Subject: change to kick rtd --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 592b08448..a673396ba 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,7 @@ 1.4a1 (2012-09-16) ================== + Bug Fixes --------- -- cgit v1.2.3 From 8c51dfc02a889f0296df6455d0b62a2c805e39ec Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 16 Sep 2012 23:23:04 -0400 Subject: change to kick rtd --- CHANGES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index a673396ba..592b08448 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,6 @@ 1.4a1 (2012-09-16) ================== - Bug Fixes --------- -- cgit v1.2.3 From 2389c332c63d0fedf5b65d45b0db55cb9c601818 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sun, 16 Sep 2012 23:37:14 -0400 Subject: no longer in progress --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 65d1cb83b..7abae7a85 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -160,7 +160,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 68c25d39f9c0531be2916ad433904c7247c0f5c7 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 19 Sep 2012 03:31:09 -0400 Subject: garden --- CHANGES.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 592b08448..e08a69b84 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,12 @@ +Next release +============ + +Features +-------- + +- A new ``pyramid.session.check_csrf_token`` convenience function was added. + + 1.4a1 (2012-09-16) ================== -- cgit v1.2.3 From 80cd0b1ab6b97c99863db045a2dda984e006c3b9 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Wed, 19 Sep 2012 04:48:14 -0400 Subject: garden --- CHANGES.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index e08a69b84..58e484a92 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,11 @@ Features - A new ``pyramid.session.check_csrf_token`` convenience function was added. +- A ``check_csrf`` view predicate was added. For example, you can now do + ``config.add_view(someview, check_csrf=True)``. When the predicate is + checked, if the ``csrf_token`` value in ``request.params`` matches the CSRF + token in the request's session, the view will be permitted to execute. + Otherwise, it will not be permitted to execute. 1.4a1 (2012-09-16) ================== -- cgit v1.2.3 From d27bc7903516b8666ea814c5bb8c10de64a679f5 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 22 Sep 2012 07:59:53 -0400 Subject: garden --- CHANGES.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 58e484a92..104ed1e98 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Next release ============ +Bug Fixes +--------- + +- It is now possible to use asset specifications which contain a hyphen in + Mako asset spec names. See https://github.com/Pylons/pyramid/pull/692 + Features -------- -- cgit v1.2.3 From 4388d317712be00a1d49cc73ac78407fe6906263 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Sat, 22 Sep 2012 08:06:52 -0400 Subject: mirror john's change for chameleon, better changelog message --- CHANGES.txt | 5 +++-- pyramid/renderers.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 104ed1e98..4e6feb68c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -4,8 +4,9 @@ Next release Bug Fixes --------- -- It is now possible to use asset specifications which contain a hyphen in - Mako asset spec names. See https://github.com/Pylons/pyramid/pull/692 +- When trying to determine Mako defnames and Chameleon macro names in asset + specifications, take into account that the filename may have a hyphen in + it. See https://github.com/Pylons/pyramid/pull/692 Features -------- diff --git a/pyramid/renderers.py b/pyramid/renderers.py index 3252c2c93..1368e190e 100644 --- a/pyramid/renderers.py +++ b/pyramid/renderers.py @@ -437,7 +437,7 @@ class ChameleonRendererLookup(object): renderer = registry.queryUtility(ITemplateRenderer, name=spec) if renderer is None: p = re.compile( - r'(?P[\w_.:/]+)' + r'(?P[\w_.:/-]+)' r'(?:\#(?P[\w_]+))?' r'(\.(?P.*))' ) -- cgit v1.2.3