summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2014-05-12 19:17:02 -0400
committerChris McDonough <chrism@plope.com>2014-05-12 19:17:02 -0400
commita978083b5719faf13e2ccf98ae93d5b03ec0d7cb (patch)
treea1ffe16937711d514433bce8e2112aea0a8321d5 /CHANGES.txt
parent50d2b85e5e2795c2b129a86e8d388909fbc2835f (diff)
parent8b8b05fd60948d18be7428f2bedac2c9fc6cd2f6 (diff)
downloadpyramid-a978083b5719faf13e2ccf98ae93d5b03ec0d7cb.tar.gz
pyramid-a978083b5719faf13e2ccf98ae93d5b03ec0d7cb.tar.bz2
pyramid-a978083b5719faf13e2ccf98ae93d5b03ec0d7cb.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 2b80e87e2..0c461e550 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -12,6 +12,11 @@ Bug Fixes
add_route_predicate for example can not take a string and turn it into the
actual callable function.
+- Fix ``pyramid.testing.setUp`` to return a ``Configurator`` with a proper
+ package. Previously it was not possible to do package-relative includes
+ using the returned ``Configurator`` during testing. There is now a
+ ``package`` argument that can override this behavior as well.
+
Docs
----
@@ -30,6 +35,9 @@ Scaffolds
templates to have links to correctly versioned documentation and reflect
which pyramid was used to generate the scaffold.
+- Removed non-ascii copyright symbol from templates, as this was
+ causing the scaffolds to fail for project generation.
+
1.5 (2014-04-08)
================