From 01138a3f679d904386f39a56a26751a12cd46e07 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Sat, 31 May 2014 19:27:04 +0200
Subject: [PATCH] bump 1.4.6
---
docs/whatsnew-1.4.rst | 6 ++++++
docs/conf.py | 2 +-
setup.py | 2 +-
CHANGES.txt | 5 +++--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 75a5ed8..26b6e0b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,8 +1,9 @@
-Next Release
-============
+1.4.6 (2014-05-31)
+==================
Bug Fixes
---------
+
- Allow ``config.add_route_predicate`` and ``config.add_view_predicate`` to
accept an importable dotted-string for the ``factory`` argument.
diff --git a/docs/conf.py b/docs/conf.py
index 51d6dae..3f60c87 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -82,7 +82,7 @@
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.4.5'
+version = '1.4.6'
# 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 34fda5f..866a257 100644
--- a/docs/whatsnew-1.4.rst
+++ b/docs/whatsnew-1.4.rst
@@ -242,6 +242,12 @@
only a single ``event`` argument even if they've been subscribed for
notifications that involve multiple interfaces.
+- Allow ``config.add_route_predicate`` and ``config.add_view_predicate`` to
+ accept an importable dotted-string for the ``factory`` argument.
+
+- Fix an exception in ``package_name()`` when resolving the package
+ name for namespace packages.
+
Backwards Incompatibilities
---------------------------
diff --git a/setup.py b/setup.py
index a551eff..e80b90f 100644
--- a/setup.py
+++ b/setup.py
@@ -68,7 +68,7 @@
]
setup(name='pyramid',
- version='1.4.5',
+ version='1.4.6',
description=('The Pyramid web application development framework, a '
'Pylons project'),
long_description=README + '\n\n' + CHANGES,
--
Gitblit v1.9.3