diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
| commit | 6a28ee15243fa1a3ae918d176cc6629c1cacfb7e (patch) | |
| tree | 98576c6ad37cf7c6c0cfaf62b635723380cc2393 /docs/tutorials/wiki2/src/basiclayout | |
| parent | fc477b2e4b20ae2788e468e45b2831e774be8ced (diff) | |
| parent | bd5a7ff20d9bdeaf36ef4154cbb0322696a46e2b (diff) | |
| download | pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.gz pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.bz2 pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.zip | |
fix merge conflict
Diffstat (limited to 'docs/tutorials/wiki2/src/basiclayout')
| -rw-r--r-- | docs/tutorials/wiki2/src/basiclayout/setup.py | 5 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/src/basiclayout/setup.py b/docs/tutorials/wiki2/src/basiclayout/setup.py index e7d318128..15e7e5923 100644 --- a/docs/tutorials/wiki2/src/basiclayout/setup.py +++ b/docs/tutorials/wiki2/src/basiclayout/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', ] diff --git a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py index aac7c5e69..867049e4f 100644 --- a/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py +++ b/docs/tutorials/wiki2/src/basiclayout/tutorial/__init__.py @@ -14,6 +14,7 @@ def main(global_config, **settings): DBSession.configure(bind=engine) Base.metadata.bind = engine config = Configurator(settings=settings) + config.include('pyramid_chameleon') config.add_static_view('static', 'static', cache_max_age=3600) config.add_route('home', '/') config.scan() |