Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.

Commit d302a62

Browse files
author
Matthias Koeppe
committed
tox.ini, src/tox.ini: Adjust to tox 4, autoprovision tox >= 3.18
1 parent bb7ee85 commit d302a62

File tree

2 files changed

+21
-14
lines changed

2 files changed

+21
-14
lines changed

src/tox.ini

+6-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ envlist = doctest, coverage, startuptime, pycodestyle-minimal, relint, codespell
2525
# When adding environments above, also update the delegations in SAGE_ROOT/tox.ini
2626
skipsdist = true
2727

28+
requires =
29+
# For the renamed "allowlist_externals" keyword
30+
tox>=3.18
31+
2832
[sagedirect]
2933
# Base for tox environments that bypass the virtual environment set up by tox,
3034
# calling sage directly.
@@ -124,9 +128,9 @@ description =
124128
# https://github.com/codingjoe/relint
125129
# The patterns are in .relint.yml
126130
deps = relint
127-
whitelist_externals = find
131+
allowlist_externals = find
128132
commands = find {posargs:{toxinidir}/sage/} \
129-
-name "*#*" -prune -o \
133+
-name "*\#*" -prune -o \
130134
-name "*.a" -prune -o \
131135
-name "*.bak" -prune -o \
132136
-name "*.bz2" -prune -o \

tox.ini

+15-12
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,9 @@ envlist =
128128
#
129129
# pycodestyle
130130

131+
requires =
132+
# For the renamed "allowlist_externals" keyword
133+
tox>=3.18
131134

132135
skipsdist = true
133136

@@ -582,7 +585,7 @@ setenv =
582585
platform =
583586
local-macos: darwin
584587

585-
whitelist_externals =
588+
allowlist_externals =
586589
bash
587590
docker: docker
588591
homebrew: brew
@@ -684,7 +687,7 @@ commands =
684687

685688
[testenv:check_configure]
686689
## Test that configure behaves properly
687-
whitelist_externals =
690+
allowlist_externals =
688691
bash
689692
setenv =
690693
HOME = {envdir}
@@ -697,7 +700,7 @@ commands =
697700
passenv =
698701
HOME
699702
envdir = {toxworkdir}/src
700-
whitelist_externals = tox
703+
allowlist_externals = tox
701704
commands = tox -c {toxinidir}/src/tox.ini -e {envname} -- {posargs}
702705

703706
[testenv:doctest]
@@ -706,54 +709,54 @@ description =
706709
passenv = {[sage_src]passenv}
707710
envdir = {[sage_src]envdir}
708711
commands = {[sage_src]commands}
709-
whitelist_externals = {[sage_src]whitelist_externals}
712+
allowlist_externals = {[sage_src]allowlist_externals}
710713

711714
[testenv:coverage]
712715
description =
713716
give information about doctest coverage of files (same as "sage --coverage[all]")
714717
passenv = {[sage_src]passenv}
715718
envdir = {[sage_src]envdir}
716719
commands = {[sage_src]commands}
717-
whitelist_externals = {[sage_src]whitelist_externals}
720+
allowlist_externals = {[sage_src]allowlist_externals}
718721

719722
[testenv:startuptime]
720723
description =
721724
display how long each component of Sage takes to start up (same as "sage --startuptime")
722725
passenv = {[sage_src]passenv}
723726
envdir = {[sage_src]envdir}
724727
commands = {[sage_src]commands}
725-
whitelist_externals = {[sage_src]whitelist_externals}
728+
allowlist_externals = {[sage_src]allowlist_externals}
726729

727730
[testenv:pycodestyle]
728731
description =
729732
check against the Python style conventions of PEP8
730733
passenv = {[sage_src]passenv}
731734
envdir = {[sage_src]envdir}
732735
commands = {[sage_src]commands}
733-
whitelist_externals = {[sage_src]whitelist_externals}
736+
allowlist_externals = {[sage_src]allowlist_externals}
734737

735738
[testenv:pycodestyle-minimal]
736739
description =
737740
check against Sage's minimal style conventions
738741
passenv = {[sage_src]passenv}
739742
envdir = {[sage_src]envdir}
740743
commands = {[sage_src]commands}
741-
whitelist_externals = {[sage_src]whitelist_externals}
744+
allowlist_externals = {[sage_src]allowlist_externals}
742745
743746
[testenv:relint]
744747
description =
745748
check whether some forbidden patterns appear - similar to patchbot plugins
746749
passenv = {[sage_src]passenv}
747750
envdir = {[sage_src]envdir}
748751
commands = {[sage_src]commands}
749-
whitelist_externals = {[sage_src]whitelist_externals}
752+
allowlist_externals = {[sage_src]allowlist_externals}
750753
751754
[testenv:codespell]
752755
description =
753756
check for misspelled words in source code (use -w -i to fix)
754757
passenv = {[sage_src]passenv}
755758
envdir = {[sage_src]envdir}
756-
whitelist_externals = {[sage_src]whitelist_externals}
759+
allowlist_externals = {[sage_src]allowlist_externals}
757760
# Run on the whole project, not just src/ by default, if invoked directly at top level
758761
commands = tox -c {toxinidir}/src/tox.ini -e {envname} -- {posargs:{toxinidir}}
759762
@@ -763,12 +766,12 @@ description =
763766
passenv = {[sage_src]passenv}
764767
envdir = {[sage_src]envdir}
765768
commands = {[sage_src]commands}
766-
whitelist_externals = {[sage_src]whitelist_externals}
769+
allowlist_externals = {[sage_src]allowlist_externals}
767770
768771
[testenv:rst]
769772
description =
770773
validate Python docstrings markup as reStructuredText
771774
passenv = {[sage_src]passenv}
772775
envdir = {[sage_src]envdir}
773776
commands = {[sage_src]commands}
774-
whitelist_externals = {[sage_src]whitelist_externals}
777+
allowlist_externals = {[sage_src]allowlist_externals}

0 commit comments

Comments
 (0)