summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/src/tests/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2012-01-10 14:45:12 -0500
committerChris McDonough <chrism@plope.com>2012-01-10 14:45:12 -0500
commit26484029f9d4d591e9541547f6d5e381ce3a0be2 (patch)
treeaba3132e660b320a6734adb0d93a3b6bbdcf5877 /docs/tutorials/wiki2/src/tests/setup.py
parenta21278872884809cfec7d5de8c64518c404f2b02 (diff)
parentcf3a11e990adda800e284effb006f1c28335da4d (diff)
downloadpyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.gz
pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.bz2
pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.zip
Merge branch '1.3-branch'
Diffstat (limited to 'docs/tutorials/wiki2/src/tests/setup.py')
-rw-r--r--docs/tutorials/wiki2/src/tests/setup.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/docs/tutorials/wiki2/src/tests/setup.py b/docs/tutorials/wiki2/src/tests/setup.py
index f965ccc6e..d05495fbd 100644
--- a/docs/tutorials/wiki2/src/tests/setup.py
+++ b/docs/tutorials/wiki2/src/tests/setup.py
@@ -1,5 +1,4 @@
import os
-import sys
from setuptools import setup, find_packages
@@ -14,13 +13,11 @@ requires = [
'pyramid_tm',
'pyramid_debugtoolbar',
'zope.sqlalchemy',
+ 'waitress',
'docutils',
'WebTest', # add this
]
-if sys.version_info[:3] < (2,5,0):
- requires.append('pysqlite')
-
setup(name='tutorial',
version='0.0',
description='tutorial',