Merge pull request #1507 from stevepiercy/1.2-branch

Steve Piercy

2014-12-27 debcc94e683ed8e6e61abc35bdd483ca382ef7c0

Merge pull request #1507 from stevepiercy/1.2-branch

cherrypick from master, pin Sphinx to 1.2.3

 rtd.txt

@@ -1,3 +1,4 @@
Sphinx >= 1.2.3
repoze.sphinx.autointerface
repoze.lru
pylons_sphinx_latesturl

 setup.py

@@ -43,14 +43,14 @@


if platform.system() == 'Java':
    docs_require = ['Sphinx']
    docs_require = ['Sphinx >= 1.2.3']
    tests_require = ['WebTest']
else:
    docs_require = ['Sphinx',
    docs_require = ['Sphinx >= 1.2.3',
                    'repoze.sphinx.autointerface',
                    'pylons_sphinx_latesturl',
                   ]
    tests_require = ['Sphinx',
    tests_require = ['Sphinx >= 1.2.3',
                     'docutils',
                     'WebTest < 2.0dev',
                     'nose',