From a41c8ca521ba983594364b1eb1f6c6025149fbe7 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 20 Jan 2012 16:53:55 +0100
Subject: [PATCH] prep for 1.3a6

---
 docs/whatsnew-1.3.rst |   15 +++++++++++++++
 docs/conf.py          |    2 +-
 setup.py              |    2 +-
 CHANGES.txt           |    4 ++--
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index c1b6ae9..ea86526 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Unreleased
-==========
+1.3a6 (2012-01-20)
+==================
 
 Features
 --------
diff --git a/docs/conf.py b/docs/conf.py
index 2ab56ca..3496bd3 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -80,7 +80,7 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.3a5'
+version = '1.3a6'
 
 # The full version, including alpha/beta/rc tags.
 release = version
diff --git a/docs/whatsnew-1.3.rst b/docs/whatsnew-1.3.rst
index ee4e2cc..ed7024f 100644
--- a/docs/whatsnew-1.3.rst
+++ b/docs/whatsnew-1.3.rst
@@ -240,6 +240,16 @@
 - We allow extra keyword arguments to be passed to the
   :meth:`pyramid.config.Configurator.action` method.
 
+- New API: :meth:`pyramid.config.Configurator.set_request_property`. Add lazy
+  property descriptors to a request without changing the request factory.
+  This method provides conflict detection and is the suggested way to add
+  properties to a request.
+
+- Responses generated by Pyramid's :class:`pyramid.views.static_view` now use
+  a ``wsgi.file_wrapper`` (see
+  http://www.python.org/dev/peps/pep-0333/#optional-platform-specific-file-handling)
+  when one is provided by the web server.
+
 Backwards Incompatibilities
 ---------------------------
 
@@ -300,6 +310,11 @@
   ``add_route`` as a pattern, it will now fail at startup time.  Use Unicode
   instead.
 
+- The ``path_info`` route and view predicates now match against
+  ``request.upath_info`` (Unicode) rather than ``request.path_info``
+  (indeterminate value based on Python 3 vs. Python 2).  This has to be done
+  to normalize matching on Python 2 and Python 3.
+
 Documentation Enhancements
 --------------------------
 
diff --git a/setup.py b/setup.py
index 91b0567..64c0ad4 100644
--- a/setup.py
+++ b/setup.py
@@ -56,7 +56,7 @@
         ])
 
 setup(name='pyramid',
-      version='1.3a5',
+      version='1.3a6',
       description=('The Pyramid web application development framework, a '
                    'Pylons project'),
       long_description=README + '\n\n' +  CHANGES,

--
Gitblit v1.9.3