From 072cbf7ae84e80185ebc122d0c11a6838ac36093 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Thu, 27 Sep 2012 17:40:57 +0200
Subject: [PATCH] prep for 1.4a2
---
docs/whatsnew-1.4.rst | 3 +++
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 4 ++--
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 0b27a74..cfdaf42 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next release
-============
+1.4a2 (2012-09-27)
+==================
Bug Fixes
---------
diff --git a/docs/conf.py b/docs/conf.py
index 7abae7a..337b1d8 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -81,7 +81,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4a1'
+version = '1.4a2'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/docs/whatsnew-1.4.rst b/docs/whatsnew-1.4.rst
index 86bfc7c..4e64d81 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -162,6 +162,9 @@
token in the request's session, the view will be permitted to execute.
Otherwise, it will not be permitted to execute.
+- Add ``Base.metadata.bind = engine`` to ``alchemy`` scaffold, so that tables
+ defined imperatively will work.
+
Backwards Incompatibilities
---------------------------
diff --git a/setup.py b/setup.py
index bb0bf45..9af2f21 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
]
setup(name='pyramid',
- version='1.4a1',
+ version='1.4a2',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,
--
Gitblit v1.9.3