prep for 1.0.8

CHANGES.txt

@@ -1,7 +1,8 @@
-Next release
-------------
+1.0.8 (2013-09-09)
+------------------
 
-- Depend on ``pyramid_mako`` (Mako support split out of Pyramid in 1.5+).
+- Depend on ``pyramid_mako`` (Mako support will be split out of Pyramid in
+  1.5+).
 
 1.0.7 (2013-08-29)
 ------------------

demo/demo.py

@@ -10,20 +10,13 @@
 from pyramid.httpexceptions import HTTPNotFound
 from pyramid.session import UnencryptedCookieSessionFactoryConfig
 from pyramid.view import view_config
-from pyramid.response import Response
 from wsgiref.simple_server import make_server
 
 try:
     import sqlalchemy
 except ImportError: # pragma: no cover
     sqlalchemy = None
 
-try:
-    import pyramid_jinja2
-except ImportError: # pragma: no cover
-    pyramid_jinja2 = None
-
-
 # True if we are running on Python 3.
 PY3 = sys.version_info[0] == 3
 
@@ -62,7 +55,7 @@ def test_page(request):
     log.info(title)
     return {
         'title': title,
-        'show_jinja2_link': bool(pyramid_jinja2),
+        'show_jinja2_link': True,
         'show_sqla_link': bool(sqlalchemy)}
 
 @view_config(route_name='test_redirect')
@@ -79,18 +72,14 @@ def test_highorder(request):
 def test_predicates(request):
     return {'title':'Test route predicates'}
 
-@view_config(route_name='test_chameleon_exc',
-             renderer='__main__:templates/error.pt')
 @view_config(route_name='test_mako_exc',
         renderer='__main__:templates/error.mako')
+@view_config(route_name='test_chameleon_exc',
+        renderer='__main__:templates/error.pt')
+@view_config(route_name='test_jinja2_exc',
+        renderer='__main__:templates/error.jinja2')
 def test_template_exc(request):
     return {'title':'Test template exceptions'}
-if pyramid_jinja2 is not None:
-    test_template_exc = view_config(
-        route_name='test_jinja2_exc',
-        renderer='__main__:templates/error.jinja2')(
-        test_template_exc)
-
 
 class DummyRootFactory(object):
     def __init__(self, request):
@@ -129,8 +118,9 @@ def __getitem__(self, name):
     config.add_route('test_jinja2_exc', '/jinja2_exc')
     config.add_route('test_highorder', text_(b'/La Pe\xc3\xb1a', 'utf-8'))
     config.scan('__main__')
-    if pyramid_jinja2:
-        config.include('pyramid_jinja2')
+    config.include('pyramid_chameleon')
+    config.include('pyramid_jinja2')
+    config.include('pyramid_mako')
     if sqlalchemy:
         config.include('sqla')
     config.include('pyramid_debugtoolbar')

demo/setup.py

@@ -26,7 +26,10 @@
 install_requires=[
     'pyramid>=1.1.1dev',
     'pyramid_debugtoolbar',
-    'SQLAlchemy'
+    'SQLAlchemy',
+    'pyramid_mako',
+    'pyramid_jinja2',
+    'pyramid_chameleon',
     ]
 
 setup(name='debugtoolbar_demo',

docs/conf.py

@@ -62,7 +62,7 @@
 # other places throughout the built documents.
 #
 # The short X.Y version.
-version = '1.0.7'
+version = '1.0.8'
 # The full version, including alpha/beta/rc tags.
 release = version
 

setup.py

@@ -1,6 +1,6 @@
 ##############################################################################
 #
-# Copyright (c) 2008-2011 Agendaless Consulting and Contributors.
+# Copyright (c) 2008-2013 Agendaless Consulting and Contributors.
 # All Rights Reserved.
 #
 # This software is subject to the provisions of the BSD-like license at
@@ -39,7 +39,7 @@
     ]
 
 setup(name='pyramid_debugtoolbar',
-      version='1.0.7',
+      version='1.0.8',
       description=('A package which provides an interactive HTML debugger '
                    'for Pyramid application development'),
       long_description=README + '\n\n' + CHANGES,

tox.ini

@@ -6,19 +6,14 @@ envlist =
 commands = 
     python setup.py dev
     python -Wd setup.py test -q
-deps =
-    https://github.com/Pylons/webob/zipball/master
-    https://github.com/Pylons/pyramid/zipball/master
 
 [testenv:cover]
 basepython =
-    python2.6
+    python2.7
 commands = 
     python setup.py dev
     python -Wd setup.py nosetests --with-xunit --with-xcoverage
-deps =
-    https://github.com/Pylons/webob/zipball/master
-    https://github.com/Pylons/pyramid/zipball/master
+deps = 
     nose
     coverage==3.4
     nosexcover