summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki/src/tests/setup.py
diff options
context:
space:
mode:
authorBert JW Regeer <bertjw@regeer.org>2016-04-12 18:03:57 -0600
committerBert JW Regeer <bertjw@regeer.org>2016-04-12 18:03:57 -0600
commitf3420699895969e825913da51dedfa5b880bc7d5 (patch)
tree40bace55d7c03e53c490b465df2b5b27e024b1a6 /docs/tutorials/wiki/src/tests/setup.py
parentc8a9a4a279b7568657c5dc3e8f2ad8da31be5890 (diff)
parentefaf7300c9c3ef2a795aae7f724bf5b02e96cd75 (diff)
downloadpyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.gz
pyramid-f3420699895969e825913da51dedfa5b880bc7d5.tar.bz2
pyramid-f3420699895969e825913da51dedfa5b880bc7d5.zip
Merge branch 'master' into feature/BeforeTraversal
Diffstat (limited to 'docs/tutorials/wiki/src/tests/setup.py')
-rw-r--r--docs/tutorials/wiki/src/tests/setup.py22
1 files changed, 14 insertions, 8 deletions
diff --git a/docs/tutorials/wiki/src/tests/setup.py b/docs/tutorials/wiki/src/tests/setup.py
index b67b702cf..beeed75c9 100644
--- a/docs/tutorials/wiki/src/tests/setup.py
+++ b/docs/tutorials/wiki/src/tests/setup.py
@@ -18,7 +18,12 @@ requires = [
'ZODB3',
'waitress',
'docutils',
- 'WebTest', # add this
+ ]
+
+tests_require = [
+ 'WebTest >= 1.3.1', # py3 compat
+ 'pytest', # includes virtualenv
+ 'pytest-cov',
]
setup(name='tutorial',
@@ -26,11 +31,11 @@ setup(name='tutorial',
description='tutorial',
long_description=README + '\n\n' + CHANGES,
classifiers=[
- "Programming Language :: Python",
- "Framework :: Pyramid",
- "Topic :: Internet :: WWW/HTTP",
- "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
- ],
+ "Programming Language :: Python",
+ "Framework :: Pyramid",
+ "Topic :: Internet :: WWW/HTTP",
+ "Topic :: Internet :: WWW/HTTP :: WSGI :: Application",
+ ],
author='',
author_email='',
url='',
@@ -38,9 +43,10 @@ setup(name='tutorial',
packages=find_packages(),
include_package_data=True,
zip_safe=False,
+ extras_require={
+ 'testing': tests_require,
+ },
install_requires=requires,
- tests_require=requires,
- test_suite="tutorial",
entry_points="""\
[paste.app_factory]
main = tutorial:main