summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-26 01:49:11 +0000
committerGerrit Code Review <review@openstack.org>2018-03-26 01:49:11 +0000
commit65e7d159c368f6fb7c340e73bbdfe1d2100c333f (patch)
tree43a495b53adf8ba5ec5f8134b543f09aa2f73fd8
parente2b6ee41956613f617712319bd1db0f7035a23cd (diff)
parent065924ecfcfb0138c6b9d4729fc73df28ea25bdd (diff)
downloadcliff-65e7d159c368f6fb7c340e73bbdfe1d2100c333f.tar.gz
Merge "Updated from global requirements"
-rw-r--r--doc/requirements.txt2
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt2
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index c022694..827758f 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,5 @@
# 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.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/requirements.txt b/requirements.txt
index 4f26b92..f67fd84 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,10 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr!=2.1.0,>=2.0.0 # Apache-2.0
-cmd2>=0.6.7 # MIT
+cmd2>=0.8.0 # MIT
PrettyTable<0.8,>=0.7.1 # BSD
pyparsing>=2.1.0 # MIT
six>=1.10.0 # MIT
stevedore>=1.20.0 # Apache-2.0
unicodecsv>=0.8.0;python_version<'3.0' # BSD
-PyYAML>=3.10 # MIT
+PyYAML>=3.12 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 1ebb594..4755809 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
# sphinx is required in test-requirements in addition to doc/requirements
# because there is a sphinx extension that has tests
-sphinx!=1.6.6,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
# Bandit security code scanner
bandit>=1.1.0 # Apache-2.0