Update sphinx version

Sync with global requirements and allow newer versions of pbr and
sphinx.

Change-Id: I6d782ba0a3e69522ae236d22f4c5789858a53f1a
This commit is contained in:
Andreas Jaeger 2016-10-10 21:37:42 +02:00
parent e8b0f71354
commit 2f94008fa5
2 changed files with 14 additions and 3 deletions

View File

@ -1,3 +1,6 @@
pbr>=0.6,<1.0 # The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.6 # Apache-2.0
oslosphinx oslosphinx
sphinx>=1.1.2,<1.2 sphinx!=1.3b1,<1.4,>=1.2.1 # BSD

10
setup.py Executable file → Normal file
View File

@ -16,6 +16,14 @@
import setuptools import setuptools
# In python < 2.7.4, a lazy loading of package `pbr` will break
# setuptools if some other modules registered functions in `atexit`.
# solution from: http://bugs.python.org/issue15881#msg170215
try:
import multiprocessing # noqa
except ImportError:
pass
setuptools.setup( setuptools.setup(
setup_requires=['pbr'], setup_requires=['pbr>=1.8'],
pbr=True) pbr=True)