summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-09-27 11:40:57 -0400
committerChris McDonough <chrism@plope.com>2012-09-27 11:40:57 -0400
commit072cbf7ae84e80185ebc122d0c11a6838ac36093 (patch)
tree6230e0c6fae6ea7589daf4fb2001c08268c0d9ed
parentf55cec52d3a2a64345ac2bce30c26ab274c8baea (diff)
downloadpyramid-072cbf7ae84e80185ebc122d0c11a6838ac36093.tar.gz
pyramid-072cbf7ae84e80185ebc122d0c11a6838ac36093.tar.bz2
pyramid-072cbf7ae84e80185ebc122d0c11a6838ac36093.zip
prep for 1.4a2
-rw-r--r--CHANGES.txt4
-rw-r--r--docs/conf.py2
-rw-r--r--docs/whatsnew-1.4.rst3
-rw-r--r--setup.py2
4 files changed, 7 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 0b27a74c3..cfdaf4216 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 7abae7a85..337b1d8bf 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.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 86bfc7c0a..4e64d8162 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -162,6 +162,9 @@ Minor Feature Additions
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 bb0bf45a7..9af2f2100 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@ testing_extras = tests_require + [
]
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,