summaryrefslogtreecommitdiff
path: root/docs/quick_tutorial/cookiecutters/setup.py
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
committerMichael Merickel <michael@merickel.org>2018-09-27 21:54:04 -0500
commit58d2a5f14bb787defefe7a2b1b36665c4991c0da (patch)
tree3eff83e38ad641e7285ce6788cad47a12fa14262 /docs/quick_tutorial/cookiecutters/setup.py
parentf081ae991a9107363fceeeeccd361c2f85bdd046 (diff)
parent279ee00fff1894b3451d84a8eeafae42e8638776 (diff)
downloadpyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.gz
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.tar.bz2
pyramid-58d2a5f14bb787defefe7a2b1b36665c4991c0da.zip
Merge branch 'master' into fix-deprecated-accept-predicate
Diffstat (limited to 'docs/quick_tutorial/cookiecutters/setup.py')
-rw-r--r--docs/quick_tutorial/cookiecutters/setup.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/docs/quick_tutorial/cookiecutters/setup.py b/docs/quick_tutorial/cookiecutters/setup.py
index 0d1b3f70e..9482e7c32 100644
--- a/docs/quick_tutorial/cookiecutters/setup.py
+++ b/docs/quick_tutorial/cookiecutters/setup.py
@@ -9,15 +9,16 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
CHANGES = f.read()
requires = [
+ 'plaster_pastedeploy',
'pyramid',
- 'pyramid_debugtoolbar',
'pyramid_jinja2',
+ 'pyramid_debugtoolbar',
'waitress',
]
tests_require = [
'WebTest >= 1.3.1', # py3 compat
- 'pytest',
+ 'pytest>=3.7.4',
'pytest-cov',
]