From 44883effdac471edaf893566f3aac83450d49159 Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Tue, 23 Apr 2013 23:35:11 +0200 Subject: replace deprecated method --- docs/tutorials/wiki/src/models/tutorial/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tutorials/wiki/src/models/tutorial/tests.py b/docs/tutorials/wiki/src/models/tutorial/tests.py index 9fd13a18d..0c5f99575 100644 --- a/docs/tutorials/wiki/src/models/tutorial/tests.py +++ b/docs/tutorials/wiki/src/models/tutorial/tests.py @@ -45,7 +45,7 @@ class AppmakerTests(unittest.TestCase): app_root = object() root = {'app_root': app_root} self._callFUT(root) - self.failUnless(root['app_root'] is app_root) + self.assertTrue(root['app_root'] is app_root) class ViewTests(unittest.TestCase): def setUp(self): -- cgit v1.2.3 From 3ae87810aae47f92cb0e8fe6db01464d6ffecd59 Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 24 Apr 2013 13:51:17 -0500 Subject: update changes.txt --- CHANGES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.txt b/CHANGES.txt index 9d934794a..e6dd9f0cb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -77,6 +77,7 @@ Bug Fixes predicate mismatch error when trying to use GET or DELETE methods. Now the views are found and no predicate mismatch is raised. + See https://github.com/Pylons/pyramid/pull/786 - Spaces and dots may now be in mako renderer template paths. This was broken when support for the new makodef syntax was added in 1.4a1. -- cgit v1.2.3 From 452005b6a96b6096b65ce63cb91574197cc9718c Mon Sep 17 00:00:00 2001 From: Tshepang Lekhonkhobe Date: Sun, 28 Apr 2013 19:37:48 +0200 Subject: use a cross-ref instead of a raw link --- docs/glossary.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/glossary.rst b/docs/glossary.rst index b6bd35ffe..abc37c7f8 100644 --- a/docs/glossary.rst +++ b/docs/glossary.rst @@ -698,7 +698,7 @@ Glossary :app:`Pyramid` runs on GAE. Venusian - `Venusian `_ is a library which + :ref:`Venusian` is a library which allows framework authors to defer decorator actions. Instead of taking actions when a function (or class) decorator is executed at import time, the action usually taken by the decorator is -- cgit v1.2.3 From 92deb60fdabc7092e21a0a1c48bf1b10788c7346 Mon Sep 17 00:00:00 2001 From: John Anderson Date: Fri, 3 May 2013 20:08:14 -0700 Subject: docs should be risky in master! --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 67e02471f..84b01a791 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -170,7 +170,7 @@ html_theme_path = ['_themes'] html_theme = 'pyramid' html_theme_options = dict( github_url='https://github.com/Pylons/pyramid', -# in_progress='true', + in_progress='true', ) # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths -- cgit v1.2.3 From a0f84bd416be91b7e861d3b5ba8aa7468ad3c4be Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Thu, 9 May 2013 16:26:06 -0400 Subject: Ignore coverage in new location. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5fa2a2ee4..8dca2069c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ .coverage .tox/ nosetests.xml -pyramid/coverage.xml +coverage.xml tutorial.db build/ dist/ -- cgit v1.2.3