diff options
| author | Michael Merickel <michael@merickel.org> | 2015-02-11 12:32:26 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2015-02-11 12:32:35 -0600 |
| commit | 6e9e2dbb364f371b034b681dd44e6e6b831c5760 (patch) | |
| tree | b7d8c623706f5df330d9c72d4e1c9d84dd47b6cd /setup.py | |
| parent | 14126cae5cf308ed466ed3eea576094e9c2193b4 (diff) | |
| parent | 1dc1f28e1184960f5359c6c510d23a0e6e9dafe8 (diff) | |
| download | pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.gz pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.tar.bz2 pyramid-6e9e2dbb364f371b034b681dd44e6e6b831c5760.zip | |
Merge branch 'master' into feature.py3-coverage
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -56,7 +56,7 @@ if not PY3: tests_require.append('zope.component>=3.11.0') docs_extras = [ - 'Sphinx', + 'Sphinx >= 1.2.3', 'docutils', 'repoze.sphinx.autointerface', ] @@ -68,7 +68,7 @@ testing_extras = tests_require + [ ] setup(name='pyramid', - version='1.6dev', + version='1.6.dev0', description='The Pyramid Web Framework, a Pylons project', long_description=README + '\n\n' + CHANGES, classifiers=[ |