Partially update tox.ini to work with tox 4
This change will allow this repo to pass zuul now that this has merged: https://review.opendev.org/c/zuul/zuul-jobs/+/866943 Tox 4 deprecated whitelist_externals. Replace whitelist_externals with allowlist_externals skipsdist acts differently in tox 4. Unable to get unit tests to pass with it removed. pinning zuul to use tox < 4 Partial-Bug: #2000399 Signed-off-by: Al Bailey <al.bailey@windriver.com> Change-Id: I2efa39b371d89c4681c6d2f0cc9eb71ef6f0dbdb
This commit is contained in:
parent
607632ed3b
commit
6d05e8ef38
@ -1,5 +1,7 @@
|
|||||||
---
|
---
|
||||||
- project:
|
- project:
|
||||||
|
vars:
|
||||||
|
ensure_tox_version: '<4'
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-linters
|
- openstack-tox-linters
|
||||||
|
@ -14,6 +14,7 @@ doc/source/api/
|
|||||||
dist
|
dist
|
||||||
build
|
build
|
||||||
eggs
|
eggs
|
||||||
|
.eggs
|
||||||
parts
|
parts
|
||||||
var
|
var
|
||||||
sdist
|
sdist
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = flake8,py27,py36,py39,pylint,bandit
|
envlist = flake8,py27,py36,py39,pylint,bandit
|
||||||
minversion = 1.6
|
minversion = 1.6
|
||||||
# skipsdist = True
|
|
||||||
#,pip-missing-reqs
|
|
||||||
|
|
||||||
# tox does not work if the path to the workdir is too long, so move it to /tmp
|
# tox does not work if the path to the workdir is too long, so move it to /tmp
|
||||||
toxworkdir = /tmp/{env:USER}_k8saudittox
|
toxworkdir = /tmp/{env:USER}_k8saudittox
|
||||||
@ -19,7 +17,7 @@ sitepackages = False
|
|||||||
basepython = python3
|
basepython = python3
|
||||||
|
|
||||||
# tox is silly... these need to be separated by a newline....
|
# tox is silly... these need to be separated by a newline....
|
||||||
whitelist_externals = bash
|
allowlist_externals = bash
|
||||||
find
|
find
|
||||||
|
|
||||||
install_command = pip install -v -v -v \
|
install_command = pip install -v -v -v \
|
||||||
|
4
tox.ini
4
tox.ini
@ -1,8 +1,8 @@
|
|||||||
[tox]
|
[tox]
|
||||||
envlist = linters
|
envlist = linters
|
||||||
minversion = 2.3
|
minversion = 2.3
|
||||||
skipsdist = True
|
|
||||||
sitepackages=False
|
sitepackages=False
|
||||||
|
skipsdist=True
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
install_command = pip install -U {opts} {packages}
|
install_command = pip install -U {opts} {packages}
|
||||||
@ -15,7 +15,7 @@ setenv =
|
|||||||
deps =
|
deps =
|
||||||
-r{toxinidir}/requirements.txt
|
-r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
whitelist_externals =
|
allowlist_externals =
|
||||||
bash
|
bash
|
||||||
|
|
||||||
[testenv:bashate]
|
[testenv:bashate]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user