Skip to content

Commit 6af54cf

Browse files
Zuulopenstack-gerrit
Zuul
authored andcommitted
Merge "CI: constrain deps for tests"
2 parents 0e8f64f + 3c529ce commit 6af54cf

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test-requirements.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
hacking>=3.2.0,<6.2.0 # Apache-2.0
22

33
coverage!=4.4,>=4.0 # Apache-2.0
4+
python-keystoneclient>=0.7.0
45
keystoneauth1>=3.4.0 # Apache-2.0
56
stestr>=2.0.0,!=3.0.0 # Apache-2.0
67
openstacksdk>=0.11.0 # Apache-2.0

tox.ini

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[tox]
22
envlist = py3,pep8
33
minversion = 3.18.0
4-
skipsdist = True
54

65
[testenv]
6+
skipsdist = True
77
usedevelop = True
88
list_dependencies_command = python -m pip freeze
99
setenv =
1010
LANG=en_US.utf-8
1111
VIRTUAL_ENV={envdir}
1212

13-
deps = -r{toxinidir}/requirements.txt
13+
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
14+
-r{toxinidir}/requirements.txt
1415
-r{toxinidir}/test-requirements.txt
15-
.[keystone]
1616
commands = sh -c '(find . -not \( -type d -name .?\* -prune \) \
1717
\( -type d -name "__pycache__" -or -type f -name "*.py[co]" \) \
1818
-print0) | xargs -0 rm -rf'
@@ -88,8 +88,7 @@ commands = bindep test
8888

8989
[testenv:releasenotes]
9090
usedevelop = False
91-
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
92-
-r{toxinidir}/doc/requirements.txt
91+
deps = {[testenv:docs]deps}
9392
commands = sphinx-build -a -W -E -d releasenotes/build/doctrees -b html releasenotes/source releasenotes/build/html
9493

9594
[testenv:pdf-docs]

0 commit comments

Comments
 (0)