Browse code

Merge "update sphinx"

Jenkins authored on 2017/05/27 04:22:36
Showing 2 changed files
... ...
@@ -15,6 +15,7 @@ classifier =
15 15
 all_files = 1
16 16
 build-dir = doc/build
17 17
 source-dir = doc/source
18
+warning-is-error = 1
18 19
 
19 20
 [pbr]
20 21
 warnerrors = True
... ...
@@ -37,8 +37,8 @@ commands = bash -c "find {toxinidir}             \
37 37
 deps =
38 38
    Pygments
39 39
    docutils
40
-   sphinx>=1.1.2,<1.2
41
-   pbr>=0.6,!=0.7,<1.0
40
+   sphinx>=1.5.1,<1.6.1
41
+   pbr>=2.0.0,!=2.1.0
42 42
    oslosphinx
43 43
    nwdiag
44 44
    blockdiag
... ...
@@ -52,8 +52,8 @@ commands =
52 52
 
53 53
 [testenv:venv]
54 54
 deps =
55
-   pbr>=0.6,!=0.7,<1.0
56
-   sphinx>=1.1.2,<1.2
55
+   pbr>=2.0.0,!=2.1.0
56
+   sphinx>=1.5.1,<1.6.1
57 57
    oslosphinx
58 58
    blockdiag
59 59
    sphinxcontrib-blockdiag