From af84a5f1c3650ef797c4867816fb27f918080138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio=20=28Lunar=29?= <lunar@softwareheritage.org> Date: Thu, 16 Feb 2023 17:17:05 +0100 Subject: [PATCH] Update and clean tox configuration for version 4 Related to swh/meta#4959 --- tox.ini | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tox.ini b/tox.ini index eed33ce..f6e3d20 100644 --- a/tox.ini +++ b/tox.ini @@ -1,4 +1,6 @@ [tox] +requires = + tox>4 envlist=black,flake8,mypy,py3 [testenv] @@ -41,15 +43,14 @@ commands = # git HEAD of swh-docs, is executed on CI for each diff to prevent # breaking doc build [testenv:sphinx] -whitelist_externals = make +allowlist_externals = make usedevelop = true extras = testing graph deps = # fetch and install swh-docs in develop mode - -e git+https://forge.softwareheritage.org/source/swh-docs#egg=swh.docs - + -e git+https://forge.softwareheritage.org/source/swh-docs.git\#egg=swh.docs setenv = SWH_PACKAGE_DOC_TOX_BUILD = 1 # turn warnings into errors @@ -57,11 +58,10 @@ setenv = commands = make -I ../.tox/sphinx/src/swh-docs/swh/ -C docs - # build documentation only inside swh-environment using local state # of swh-docs package [testenv:sphinx-dev] -whitelist_externals = make +allowlist_externals = make usedevelop = true extras = testing @@ -69,7 +69,6 @@ extras = deps = # install swh-docs in develop mode -e ../swh-docs - setenv = SWH_PACKAGE_DOC_TOX_BUILD = 1 # turn warnings into errors -- GitLab