aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tox-requirements.txt25
-rw-r--r--tox.ini16
2 files changed, 21 insertions, 20 deletions
diff --git a/tox-requirements.txt b/tox-requirements.txt
index 550fc1d3b3..2b2d309fb4 100644
--- a/tox-requirements.txt
+++ b/tox-requirements.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2022 Cisco and/or its affiliates.
+# Copyright (c) 2024 Cisco and/or its affiliates.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at:
@@ -12,16 +12,17 @@
# limitations under the License.
# Tox dependencies.
-tox==3.25.1
+tox==4.18.0
# Other PIP freeze dependencies.
-distlib==0.3.4
-filelock==3.7.1
-packaging==21.3
-platformdirs==2.5.2
-pluggy==1.0.0
-pyparsing==3.0.9
-py==1.11.0
-six==1.16.0
-toml==0.10.2
-virtualenv==20.15.1
+cachetools==5.5.0
+chardet==5.2.0
+colorama==0.4.6
+distlib==0.3.8
+filelock==3.15.4
+packaging==24.1
+platformdirs==4.2.2
+pluggy==1.5.0
+pyproject-api==1.7.1
+tomli==2.0.1
+virtualenv==20.26.3
diff --git a/tox.ini b/tox.ini
index e0ac85c22a..c61677477f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,30 +39,30 @@ script_dir = ./resources/libraries/bash/entry/tox
# + ignore_outcome for non-voting checkers,
# + setenv (PYTHONPATH) for Python-using checkers and fixers.
# + Other Python stuff (e.g. basepython and deps for pylint).
-# + whitelist_externals to enable bash.
+# + allowlist_externals to enable bash.
# + Commands with a single bash to launch the corresponding script.
[testenv:autogen]
setenv = PYTHONPATH = {toxinidir}
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/autogen.sh
[testenv:copyright_year]
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/copyright_year.sh
[testenv:fix_copyright_year]
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/fix_copyright_year.sh
[testenv:gpl_license]
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/gpl_license.sh
[testenv:line_length]
# Fix all transgressions and remove the ignore_outcome flag.
ignore_outcome = true
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/line.sh
[testenv:new_line_length]
@@ -70,7 +70,7 @@ commands = bash {[tox]script_dir}/line.sh
# As current implementation is too dumb to filter those out,
# the checker has to remain non-voting.
ignore_outcome = true
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/new_line.sh
[testenv:pylint]
@@ -79,5 +79,5 @@ ignore_outcome = true
setenv = PYTHONPATH = {toxinidir}
basepython = python3
deps = -r ./requirements.txt
-whitelist_externals = bash
+allowlist_externals = bash
commands = bash {[tox]script_dir}/pylint.sh