summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-09-06 19:14:41 +0000
committerGerrit Code Review <review@openstack.org>2019-09-06 19:14:41 +0000
commit6b6b1863ff757f07c73b1285dc6a2cb48a546f8e (patch)
treeedf93368b248e40f486997011575828b6ddde835
parent48d4a0fdf23f1990532499f80d02c32d5799ced9 (diff)
parent01ce75f5b36d2e729d0dc749c49f091617090107 (diff)
downloadcliff-6b6b1863ff757f07c73b1285dc6a2cb48a546f8e.tar.gz
Merge "Pin cmd2 back to <0.9 on all versions"train-em2.16.0
-rw-r--r--doc/requirements.txt3
-rw-r--r--requirements.txt3
-rw-r--r--test-requirements.txt3
3 files changed, 5 insertions, 4 deletions
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 827758f..d6d8d0a 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +1,6 @@
# 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.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
diff --git a/requirements.txt b/requirements.txt
index e83be76..6c3fe98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,8 +2,7 @@
# 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.8.3,<0.9.0;python_version<'3.0' # MIT
-cmd2!=0.8.3;python_version>='3.0' # MIT
+cmd2>=0.8.0,!=0.8.3,<0.9.0 # MIT
PrettyTable<0.8,>=0.7.2 # BSD
pyparsing>=2.1.0 # MIT
six>=1.10.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 4755809..45987f4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,7 +12,8 @@ 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.7,>=1.6.2 # BSD
+sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
# Bandit security code scanner
bandit>=1.1.0 # Apache-2.0