Sync requirements to fix docs jobs

building of docs fails due to incompatibilities between sphinx and other
packages. Sync requirements with global requirements, this fixes the
build problems.

Change-Id: I2060945854515fa54a8c5e3e9598a9255e5493e4
This commit is contained in:
Andreas Jaeger 2017-08-04 21:14:58 +02:00
parent 2c01042d85
commit 40d322d283
3 changed files with 14 additions and 14 deletions

View File

@ -1,14 +1,14 @@
# 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
Flask<1.0,>=0.11 # BSD
pymemcache >= 1.3.5 # Apache-2.0
dogpile.cache>=0.6.0 # BSD
pbr!=2.1.0,>=2.0.0 # Apache-2.0
Flask!=0.11,<1.0,>=0.10 # BSD
pymemcache!=1.3.0,>=1.2.9 # Apache 2.0 License
dogpile.cache>=0.6.2 # BSD
subunit2sql>=1.7.0 # Apache-2.0
SQLAlchemy<1.1.0,>=1.0.10 # MIT
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
flask-jsonpify>=1.5.0 # MIT
PyMySQL>=0.6.2 # MIT License
PyMySQL>=0.7.6 # MIT License
python-dateutil>=2.4.2 # BSD
pandas>=0.18.0 # BSD
numpy>=1.7.0 # BSD

View File

@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
setup_requires=['pbr>=1.8'],
setup_requires=['pbr>=2.0.0'],
pbr=True)

View File

@ -3,11 +3,11 @@
# process, which may cause wedges in the gate later.
hacking<0.11,>=0.10.0
coverage>=3.6 # Apache-2.0
docutils>=0.11,!=0.13.1 # OSI-Approved Open Source, Public Domain
os-testr>=0.4.1 # Apache-2.0
mock>=1.2 # BSD
fixtures>=1.3.1 # Apache-2.0/BSD
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
docutils>=0.11 # OSI-Approved Open Source, Public Domain
os-testr>=0.8.0 # Apache-2.0
mock>=2.0 # BSD
fixtures>=3.0.0 # Apache-2.0/BSD
sphinx>=1.6.2 # BSD
oslosphinx>=4.7.0 # Apache-2.0
feedparser>=5.2.1