Merge "Fix py27 tox"

This commit is contained in:
Zuul 2020-05-27 15:28:51 +00:00 committed by Gerrit Code Review
commit 4fc5ff16c7
4 changed files with 11 additions and 3 deletions

View File

@ -3,3 +3,8 @@ gcc [test]
# Required for openstacksdk
python3-devel [test platform:rpm]
python3-dev [test platform:dpkg platform:apk]
# Required for subprocess32
python2-devel [test platform:fedora]
python-devel [test platform:rpm !platform:fedora !platform:centos-8]
python-dev [test platform:dpkg platform:apk]

View File

@ -318,9 +318,8 @@ def main():
changed = False
for testenv in envlist:
testenv_config = tox_config["testenv:{}".format(testenv)]
envdir = testenv_config['envdir']
envlogdir = testenv_config['envlogdir']
envdir = tox_config.get("testenv:{}".format(testenv), 'envdir')
envlogdir = tox_config.get("testenv:{}".format(testenv), 'envlogdir')
try:
# Write a log file into the .tox dir so that it'll get picked up
# Name it with testenv as a prefix so that fetch-tox-output

1
test-constraints.txt Normal file
View File

@ -0,0 +1 @@
soupsieve < 2.0; python_version < '3.5'

View File

@ -12,6 +12,9 @@ commands = stestr run {posargs}
stestr slowest
[testenv:py27]
deps =
-r{toxinidir}/test-requirements.txt
-c{toxinidir}/test-constraints.txt
basepython = python2.7
[testenv:bindep]