summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-04-26 23:27:12 +0000
committerGerrit Code Review <review@openstack.org>2018-04-26 23:27:12 +0000
commit68b1888d0bc0b95da7bb70535e4082b97c27631b (patch)
tree40586539a59fa1d9599584c5cfd454d026e713cd
parent0c555a4126570604a68e8dc113b1ea89f611c710 (diff)
parent208af18ab8996dde2b9e479480a94251e28e01ff (diff)
downloadtaskflow-68b1888d0bc0b95da7bb70535e4082b97c27631b.tar.gz
Merge "Updated from global requirements" into stable/queens
-rw-r--r--doc/requirements.txt4
-rw-r--r--setup.cfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 4e0cd0c..16c2377 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,8 +1,8 @@
# 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.
-sphinx>=1.6.2 # BSD
-openstackdocstheme>=1.17.0 # Apache-2.0
+sphinx!=1.6.6,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
reno>=2.5.0 # Apache-2.0
doc8>=0.6.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index 8f17cc4..a1cf1c4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -75,12 +75,12 @@ database =
test =
pydotplus>=2.0.2 # MIT License
hacking<0.11,>=0.10.0
- oslotest>=1.10.0 # Apache-2.0
+ oslotest>=3.2.0 # Apache-2.0
mock>=2.0.0 # BSD
testtools>=2.2.0 # MIT
testscenarios>=0.4 # Apache-2.0/BSD
doc8>=0.6.0 # Apache-2.0
- sphinx>=1.6.2 # BSD
+ sphinx!=1.6.6,>=1.6.2 # BSD
[nosetests]
cover-erase = true