diff options
| author | Michael Merickel <michael@merickel.org> | 2012-05-03 00:11:50 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2012-05-03 00:11:50 -0500 |
| commit | c1c2b6ad8e22f9cba291de8903edfa4c7c741dca (patch) | |
| tree | c3bfa436eafa3903af04a4f4f3750a7ddb216830 /setup.py | |
| parent | c3df7a76fa9f92201fbf57693b580b8904fac038 (diff) | |
| parent | 004882434aa166a58c3b2148322e08ce61ec4cb7 (diff) | |
| download | pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.gz pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.tar.bz2 pyramid-c1c2b6ad8e22f9cba291de8903edfa4c7c741dca.zip | |
Merge branch 'master' into feature.json-api
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 21 |
1 files changed, 13 insertions, 8 deletions
@@ -50,18 +50,22 @@ install_requires=[ tests_require = [ 'WebTest >= 1.3.1', # py3 compat - 'virtualenv', ] if not PY3: - tests_require.extend([ - 'Sphinx', - 'docutils', - 'repoze.sphinx.autointerface', - 'zope.component>=3.11.0', - ]) + tests_require.append('zope.component>=3.11.0') -testing_extras = tests_require + ['nose', 'coverage'] +docs_extras = [ + 'Sphinx', + 'docutils', + 'repoze.sphinx.autointerface', + ] + +testing_extras = tests_require + [ + 'nose', + 'coverage', + 'virtualenv', # for scaffolding tests + ] setup(name='pyramid', version='1.4dev', @@ -93,6 +97,7 @@ setup(name='pyramid', install_requires = install_requires, extras_require = { 'testing':testing_extras, + 'docs':docs_extras, }, tests_require = tests_require, test_suite="pyramid.tests", |