summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-06 13:48:41 +0000
committerGerrit Code Review <review@openstack.org>2018-03-06 13:48:41 +0000
commitd07dfc5d16427646a750912db9ff593e0f507f21 (patch)
treea07010404dd4a710c0b9fdd64c9812f5897a6538
parent57927b19398b5c22eff9b9107e4d6af51fc59f42 (diff)
parent38a6e0c90d37cc2cc045ca44a55e416f610ebb2d (diff)
downloadoslo-db-d07dfc5d16427646a750912db9ff593e0f507f21.tar.gz
Merge "Updated from global requirements" into stable/queens
-rw-r--r--doc/requirements.txt6
-rw-r--r--setup.cfg2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 3882b4d..309e3f4 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.
-openstackdocstheme>=1.17.0 # Apache-2.0
-sphinx>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
+sphinx!=1.6.6,>=1.6.2 # BSD
doc8>=0.6.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
@@ -10,4 +10,4 @@ reno>=2.5.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
-oslotest>=1.10.0 # Apache-2.0
+oslotest>=3.2.0 # Apache-2.0
diff --git a/setup.cfg b/setup.cfg
index f0d107e..5f11ee3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,7 +33,7 @@ test =
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD
- oslotest>=1.10.0 # Apache-2.0
+ oslotest>=3.2.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT