summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2010-08-10 16:23:03 +0000
committerChris McDonough <chrism@agendaless.com>2010-08-10 16:23:03 +0000
commit1e0e9bfb294dbd91e1415872fe5e2957421b182e (patch)
tree7bd174bd01a4d23cd6544782e809f69ae0fc4533
parent28c8ada6c71f652fd9125a6b4bb642b6c7480d4c (diff)
downloadpyramid-1e0e9bfb294dbd91e1415872fe5e2957421b182e.tar.gz
pyramid-1e0e9bfb294dbd91e1415872fe5e2957421b182e.tar.bz2
pyramid-1e0e9bfb294dbd91e1415872fe5e2957421b182e.zip
minimally make tests run under jython
-rw-r--r--setup.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index ee38f97e8..a62a11ea8 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@
__version__ = '1.3a8'
import os
+import platform
import sys
from setuptools import setup, find_packages
@@ -42,6 +43,12 @@ install_requires=[
'translationstring',
]
+if platform.system() == 'Java':
+ tests_require = install_requires + ['twill']
+else:
+ tests_require= install_requires + ['Sphinx', 'docutils', 'coverage',
+ 'twill']
+
if sys.version_info[:2] < (2, 6):
install_requires.append('simplejson')
@@ -67,8 +74,7 @@ setup(name='repoze.bfg',
namespace_packages = ['repoze', 'repoze.bfg'],
zip_safe=False,
install_requires = install_requires,
- tests_require= install_requires + ['Sphinx', 'docutils', 'coverage',
- 'twill'],
+ tests_require = tests_require,
test_suite="repoze.bfg.tests",
entry_points = """\
[paste.paster_create_template]