Skip to content

Commit e09af5f

Browse files
committed
tox: fix py3 / docs gates
Bump version of tox to 4.02 and add requirements for the docs. Change-Id: Ib4131d1278d742a4730935240b59e6b0e3d94555
1 parent ea5e8da commit e09af5f

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

doc/requirements.txt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# The order of packages is significant, because pip processes them in the order
2+
# of appearance. Changing the order has an impact on the overall integration
3+
# process, which may cause wedges in the gate later.
4+
5+
sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
6+
openstackdocstheme>=1.31.2 # Apache-2.0
7+
sphinx_rtd_theme
8+
9+
# releasenotes
10+
reno>=2.5.0 # Apache-2.0

tox.ini

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
[tox]
2-
minversion = 1.6
3-
envlist = docs,py37,pep8
2+
minversion = 4.0.2
3+
envlist = py3,pep8
44
skipsdist = True
55

66
[testenv]
7-
basepython = python3
87
usedevelop = True
98
setenv = VIRTUAL_ENV={envdir}
109
deps =
@@ -17,7 +16,6 @@ commands = stestr run --slowest {posargs}
1716
commands = flake8 {posargs}
1817

1918
[testenv:cover]
20-
basepython = python3
2119
setenv =
2220
{[testenv]setenv}
2321
PYTHON=coverage run --source cloudbaseinit --parallel-mode
@@ -29,21 +27,20 @@ commands =
2927
coverage xml -o cover/coverage.xml
3028

3129
[testenv:venv]
32-
basepython = python3
3330
commands = {posargs}
3431

35-
[testenv:releasenotes]
36-
basepython = python3
37-
commands =
38-
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
39-
4032
[testenv:docs]
41-
basepython = python3
4233
deps =
43-
sphinx_rtd_theme
34+
-r{toxinidir}/doc/requirements.txt
35+
-egit+https://github.com/openstack/cloudbase-init\#egg=cloudbase-init
4436
commands =
4537
sphinx-build -a -E -W -d doc/build/doctrees -b html doc/source doc/build/html
4638

39+
[testenv:releasenotes]
40+
deps = {[testenv:docs]deps}
41+
commands =
42+
sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
43+
4744
[flake8]
4845
# E125 is deliberately excluded. See https://github.com/jcrocholl/pep8/issues/126
4946
# E251 Skipped due to https://github.com/jcrocholl/pep8/issues/301

0 commit comments

Comments
 (0)