Browse Source

Merge "Pin cmd2 back to <0.9 on all versions"

tags/2.16.0^0
Zuul 1 week ago
parent
commit
6b6b1863ff
3 changed files with 5 additions and 4 deletions
  1. 2
    1
      doc/requirements.txt
  2. 1
    2
      requirements.txt
  3. 2
    1
      test-requirements.txt

+ 2
- 1
doc/requirements.txt View File

@@ -1,5 +1,6 @@
1 1
 # The order of packages is significant, because pip processes them in the order
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
4
+sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7'  # BSD
5
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
5 6
 openstackdocstheme>=1.18.1 # Apache-2.0

+ 1
- 2
requirements.txt View File

@@ -2,8 +2,7 @@
2 2
 # of appearance. Changing the order has an impact on the overall integration
3 3
 # process, which may cause wedges in the gate later.
4 4
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
5
-cmd2!=0.8.3,<0.9.0;python_version<'3.0' # MIT
6
-cmd2!=0.8.3;python_version>='3.0' # MIT
5
+cmd2>=0.8.0,!=0.8.3,<0.9.0 # MIT
7 6
 PrettyTable<0.8,>=0.7.2 # BSD
8 7
 pyparsing>=2.1.0 # MIT
9 8
 six>=1.10.0 # MIT

+ 2
- 1
test-requirements.txt View File

@@ -12,7 +12,8 @@ coverage!=4.4,>=4.0 # Apache-2.0
12 12
 
13 13
 # sphinx is required in test-requirements in addition to doc/requirements
14 14
 # because there is a sphinx extension that has tests
15
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
15
+sphinx!=1.6.6,!=1.6.7,<2.0.0,>=1.6.2;python_version=='2.7'  # BSD
16
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4'  # BSD
16 17
 
17 18
 # Bandit security code scanner
18 19
 bandit>=1.1.0 # Apache-2.0

Loading…
Cancel
Save