summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2015-02-17 18:57:31 -0500
committerChris McDonough <chrism@plope.com>2015-02-17 18:57:31 -0500
commit4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790 (patch)
tree039ca762ddcf6e4946a2570136927d2773374969 /setup.py
parentc5802723a4ea035076573838138878caf01735c1 (diff)
parent75f85c57e0f4d1069cef9feb6ab6182b5f651492 (diff)
downloadpyramid-4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790.tar.gz
pyramid-4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790.tar.bz2
pyramid-4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790.zip
Merge branch 'master' of github.com:Pylons/pyramid
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index d736dc38d..3233193e7 100644
--- a/setup.py
+++ b/setup.py
@@ -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=[