summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/models/setup.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2016-03-21 23:34:26 -0500
committerMichael Merickel <michael@merickel.org>2016-03-21 23:34:26 -0500
commit5238bb64abfebc085ca95df517535f61e27b7fc2 (patch)
treec4eb14e487f561d4c12824b0b03656e24efccfd1 /docs/tutorials/wiki2/src/models/setup.py
parent0b0f7e1a6d411bcc2af615da8e9dec7ea7519152 (diff)
parent530bad618c33d65ad071b0280ce56eb265195805 (diff)
downloadpyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.gz
pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.tar.bz2
pyramid-5238bb64abfebc085ca95df517535f61e27b7fc2.zip
Merge branch 'master' into feature/configurable-view-deriver
Diffstat (limited to 'docs/tutorials/wiki2/src/models/setup.py')
-rw-r--r--docs/tutorials/wiki2/src/models/setup.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py
index 15e7e5923..bdc9ceed7 100644
--- a/docs/tutorials/wiki2/src/models/setup.py
+++ b/docs/tutorials/wiki2/src/models/setup.py
@@ -9,8 +9,9 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
CHANGES = f.read()
requires = [
+ 'bcrypt',
'pyramid',
- 'pyramid_chameleon',
+ 'pyramid_jinja2',
'pyramid_debugtoolbar',
'pyramid_tm',
'SQLAlchemy',
@@ -19,6 +20,10 @@ requires = [
'waitress',
]
+tests_require = [
+ 'WebTest',
+]
+
setup(name='tutorial',
version='0.0',
description='tutorial',
@@ -37,6 +42,7 @@ setup(name='tutorial',
include_package_data=True,
zip_safe=False,
test_suite='tutorial',
+ tests_require=tests_require,
install_requires=requires,
entry_points="""\
[paste.app_factory]