diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-08 04:45:14 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-08 04:45:14 -0400 |
| commit | 72bf7517187f68908c5c4b53760a57a99db8889b (patch) | |
| tree | 98576c6ad37cf7c6c0cfaf62b635723380cc2393 /docs/tutorials/wiki2/src/tests | |
| parent | fc477b2e4b20ae2788e468e45b2831e774be8ced (diff) | |
| parent | 6a28ee15243fa1a3ae918d176cc6629c1cacfb7e (diff) | |
| download | pyramid-72bf7517187f68908c5c4b53760a57a99db8889b.tar.gz pyramid-72bf7517187f68908c5c4b53760a57a99db8889b.tar.bz2 pyramid-72bf7517187f68908c5c4b53760a57a99db8889b.zip | |
Merge branch 'mmerickel-feature.rendering-doc-updates'
Diffstat (limited to 'docs/tutorials/wiki2/src/tests')
| -rw-r--r-- | docs/tutorials/wiki2/src/tests/setup.py | 5 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/tests/tutorial/__init__.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py index c3da36b39..d8486e462 100644 --- a/docs/tutorials/wiki2/src/tests/setup.py +++ b/docs/tutorials/wiki2/src/tests/setup.py @@ -10,10 +10,11 @@ with open(os.path.join(here, 'CHANGES.txt')) as f: requires = [ 'pyramid', + 'pyramid_chameleon', + 'pyramid_debugtoolbar', + 'pyramid_tm', 'SQLAlchemy', 'transaction', - 'pyramid_tm', - 'pyramid_debugtoolbar', 'zope.sqlalchemy', 'waitress', 'docutils', diff --git a/docs/tutorials/wiki2/src/tests/tutorial/__init__.py b/docs/tutorials/wiki2/src/tests/tutorial/__init__.py index d08e55bf9..cee89184b 100644 --- a/docs/tutorials/wiki2/src/tests/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/tests/tutorial/__init__.py @@ -23,6 +23,7 @@ def main(global_config, **settings): authz_policy = ACLAuthorizationPolicy() config = Configurator(settings=settings, root_factory='tutorial.models.RootFactory') + config.include('pyramid_chameleon') config.set_authentication_policy(authn_policy) config.set_authorization_policy(authz_policy) config.add_static_view('static', 'static', cache_max_age=3600) |