Trac #34839: Support tox 4

tox 4 renamed a tox.ini configuration keyword and has slightly changed quoting behavior. Also tox >= 3.18 supports the renamed keyword - https://tox.wiki/en/3.27.1/changelog.html#v3-18-0-2020-07-23 Also the changed quote works with both versions. URL: https://trac.sagemath.org/34839 Reported by: mkoeppe Ticket author(s): Matthias Koeppe, Frédéric Chapoton Reviewer(s): Frédéric Chapoton, Matthias Koeppe
sagemath · Jan 5, 2023 · 2dcafb3 · 2dcafb3
2 parents ad68f15 + 70da140
commit 2dcafb3
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 35 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -35,7 +35,7 @@ jobs:
     - name: Install relint
       run: pip install tox relint
     - name: Lint using relint
-      run: tox -e relint src/sage/
+      run: tox -e relint -- src/sage/
   lint-rst:
     name: Validate docstring markup as RST
     runs-on: ubuntu-latest

diff --git a/src/sage_docbuild/ext/sage_autodoc.py b/src/sage_docbuild/ext/sage_autodoc.py
@@ -97,7 +97,7 @@ def identity(x: Any) -> Any:
 
 
 class _All:
-    """A special value for :*-members: that matches to any member."""
+    """A special value for ``:*-members:`` that matches to any member."""
 
     def __contains__(self, item: Any) -> bool:
         return True

diff --git a/src/sage_setup/autogen/giacpy-mkkeywords.py b/src/sage_setup/autogen/giacpy-mkkeywords.py
@@ -1,15 +1,16 @@
-#see the discussion in  trac #29171 about where to store this file.
+# see the discussion in  trac #29171 about where to store this file.
 """
 This file is to help the maintainer to upgrade the giac keywords in
 
      giacpy or giacpy_sage or sage.libs.giac
 
-it creates auto-methods.pxi, keywords.pxi, newkeyword.pxi
-it needs: the cas_help program from a giac installation
-           the aide_cas.txt file that you can built yourself like this:
+It creates auto-methods.pxi, keywords.pxi, newkeyword.pxi
+It needs:
 
-grep -E '^#' share/giac/doc/aide_cas  |sed -e 's/^# //' >aide_cas.txt
+- the ``cas_help`` program from a giac installation
+- the ``aide_cas.txt`` file that you can built yourself like this::
 
+    grep -E '^#' share/giac/doc/aide_cas  |sed -e 's/^# //' >aide_cas.txt
 
 It should not be used on the fly for an automatic installation script, because auto-methods.pxi is
 quite long to be built and adding new giac keywords often break the built of giacpy
@@ -23,9 +24,9 @@
 """
 from subprocess import PIPE, Popen
 
-blacklist=['eval', 'cas_setup', 'i', 'list', 'input', 'in', 'sto', 'string', 'and', 'break', 'continue', 'else', 'for', 'from', 'if', 'not', 'or', 'pow', 'print', 'return', 'set[]', 'try', 'while', 'open', 'output', 'do', 'of', 'Request','i[]', '[]', 'ffunction', 'sleep', '[..]']
+blacklist = ['eval', 'cas_setup', 'i', 'list', 'input', 'in', 'sto', 'string', 'and', 'break', 'continue', 'else', 'for', 'from', 'if', 'not', 'or', 'pow', 'print', 'return', 'set[]', 'try', 'while', 'open', 'output', 'do', 'of', 'Request', 'i[]', '[]', 'ffunction', 'sleep', '[..]']
 
-toremove=['!', '!=', '#', '$', '%', '/%', '%/', '%{%}', '&&', '&*', '&^', "'", '()', '*', '*=', '+', '-', '+&', '+=', '+infinity', '-<', '-=', '->', '-infinity', '.*', '.+', '.-', './', '.^', '/=', ':=', '<', '<=', '=', '=<', '==', '=>', '>', '>=', '?', '@', '@@', 'ACOSH', 'ACOT', 'ACSC', 'ASEC', 'ASIN', 'ASINH', 'ATAN', 'ATANH', 'COND', 'COS', 'COSH', 'COT', 'CSC', 'CST', 'Celsius2Fahrenheit', 'ClrDraw', 'ClrGraph', 'ClrIO', 'CyclePic', 'DIGITS', 'DOM_COMPLEX', 'DOM_FLOAT', 'DOM_FUNC', 'DOM_IDENT', 'DOM_INT', 'DOM_LIST', 'DOM_RAT', 'DOM_STRING', 'DOM_SYMBOLIC', 'DOM_int', 'DelFold', 'DelVar', 'Det', 'Dialog', 'Digits', 'Disp', 'DispG', 'DispHome', 'DrawFunc', 'DrawInv', 'DrawParm', 'DrawPol', 'DrawSlp', 'DropDown', 'DrwCtour', 'ERROR', 'EXP', 'EndDlog', 'FALSE', 'False', 'Fahrenheit2Celsius', 'Fill', 'Gcd', 'GetFold', 'Graph', 'IFTE', 'Input', 'InputStr', 'Int', 'Inverse', 'LN', 'LQ', 'LSQ', 'NORMALD', 'NewFold', 'NewPic', 'Nullspace', 'Output', 'Ox_2d_unit_vector', 'Ox_3d_unit_vector', 'Oy_2d_unit_vector', 'Oy_3d_unit_vector', 'Oz_3d_unit_vector', 'Pause', 'PopUp', 'Quo', 'REDIM', 'REPLACE', 'RclPic', 'Rem', 'Resultant', 'RplcPic', 'Rref', 'SCALE', 'SCALEADD', 'SCHUR', 'SIN', 'SVD', 'SVL', 'SWAPCOL', 'SWAPROW', 'SetFold', 'Si', 'StoPic', 'Store', 'TAN', 'TRUE', 'True', 'TeX', 'Text', 'Title', 'Unarchiv', 'WAIT', '^', '_(cm/s)', '_(ft/s)', '_(ft*lb)', '_(m/s)', '_(m/s^2)', '_(rad/s)', '_(rad/s^2)', '_(tr/min)', '_(tr/s)', '_A', '_Angstrom', '_Bq', '_Btu', '_Ci', '_F', '_F_', '_Fdy', '_G_', '_Gal', '_Gy', '_H', '_Hz', '_I0_', '_J', '_K', '_Kcal', '_MHz', '_MW', '_MeV', '_N', '_NA_', '_Ohm', '_P', '_PSun_', '_Pa', '_R', '_REarth_', '_RSun_', '_R_', '_Rankine', '_Rinfinity_', '_S', '_St', '_StdP_', '_StdT_', '_Sv', '_T', '_V', '_Vm_', '_W', '_Wb', '_Wh', '_a', '_a0_', '_acre', '_alpha_', '_angl_', '_arcmin', '_arcs', '_atm', '_au', '_b', '_bar', '_bbl', '_bblep', '_bu', '_buUS', '_c3_', '_c_', '_cal', '_cd', '_chain', '_cm', '_cm^2', '_cm^3', '_ct', '_cu', '_d', '_dB', '_deg', '_degreeF', '_dyn', '_eV', '_epsilon0_', '_epsilon0q_', '_epsilonox_', '_epsilonsi_', '_erg', '_f0_', '_fath', '_fbm', '_fc', '_fermi', '_flam', '_fm', '_ft', '_ft*lb', '_ftUS', '_ft^2', '_ft^3', '_g', '_g_', '_ga', '_galC', '_galUK', '_galUS', '_gf', '_gmol', '_gon', '_grad', '_grain', '_h', '_h_', '_ha', '_hbar_', '_hp', '_in', '_inH20', '_inHg', '_in^2', '_in^3', '_j', '_kWh', '_k_', '_kg', '_kip', '_km', '_km^2', '_knot', '_kph', '_kq_', '_l', '_lam', '_lambda0_', '_lambdac_', '_lb', '_lbf', '_lbmol', '_lbt', '_lep', '_liqpt', '_lm', '_lx', '_lyr', '_m', '_mEarth_', '_m^2', '_m^3', '_me_', '_mho', '_miUS', '_miUS^2', '_mi^2', '_mil', '_mile', '_mille', '_ml', '_mm', '_mmHg', '_mn', '_mol', '_mp_', '_mph', '_mpme_', '_mu0_', '_muB_', '_muN_', '_oz', '_ozUK', '_ozfl', '_ozt', '_pc', '_pdl', '_ph', '_phi_', '_pk', '_psi', '_ptUK', '_q_', '_qe_', '_qepsilon0_', '_qme_', '_qt', '_rad', '_rad_', '_rd', '_rem', '_rod', '_rpm', '_s', '_sb', '_sd_', '_sigma_', '_slug', '_sr', '_st', '_syr_', '_t', '_tbsp', '_tec', '_tep', '_tex', '_therm', '_ton', '_tonUK', '_torr', '_tr', '_tsp', '_twopi_', '_u', '_yd', '_yd^2', '_yd^3', '_yr', '_\xc2\xb5', '_µ', 'assert', 'affichage', 'alors', 'animate', 'animate3d', 'animation', 'approx_mode', 'archive', 'args', 'as_function_of', 'asc', 'asec', 'assign', 'backquote', 'begin', 'black', 'blanc', 'bleu', 'bloc', 'blue', 'breakpoint', 'by', 'c1oc2', 'c1op2', 'cache_tortue', 'cap', 'cap_flat_line', 'cap_round_line', 'cap_square_line', 'case', 'cat', 'catch', 'cd', 'choosebox', 'click', 'close', 'complex_mode', 'de', 'del', 'debug', 'default', 'div', 'double', 'ecris', 'efface', 'elif', 'end', 'end_for', 'end_if', 'end_while', 'epaisseur', 'epaisseur_ligne_1', 'epaisseur_ligne_2', 'epaisseur_ligne_3', 'epaisseur_ligne_4', 'epaisseur_ligne_5', 'epaisseur_ligne_6', 'epaisseur_ligne_7', 'epaisseur_point_1', 'epaisseur_point_2', 'epaisseur_point_3', 'epaisseur_point_4', 'epaisseur_point_5', 'epaisseur_point_6', 'epaisseur_point_7', 'erase', 'erase3d', 'est_cocyclique', 'est_inclus', 'et', 'faire', 'faux', 'feuille', 'ffaire', 'ffonction', 'fi', 'filled', 'fin_enregistrement', 'float', 'fonction', 'fopen', 'format', 'fpour', 'frame_3d', 'frames', 'fsi', 'ftantque', 'func', 'function', 'gauche', 'gl_ortho', 'gl_quaternion', 'gl_rotation', 'gl_shownames', 'gl_texture', 'gl_x', 'gl_x_axis_color', 'gl_x_axis_name', 'gl_x_axis_unit', 'gl_xtick', 'gl_y', 'gl_y_axis_color', 'gl_y_axis_name', 'gl_y_axis_unit', 'gl_ytick', 'gl_z', 'gl_z_axis_color', 'gl_z_axis_name', 'gl_z_axis_unit', 'gl_ztick', 'gnuplot', 'goto', 'graph2tex', 'graph3d2tex', 'graphe', 'graphe3d', 'graphe_probabiliste', 'graphe_suite', 'green', 'grid_paper', 'hidden_name', 'identifier', 'ifft', 'ifte', 'inputform', 'intersect', 'is_included', 'jusqu_a', 'jusqua', 'jusque', 'keep_algext', 'kill', 'label', 'labels', 'len', 'leve_crayon', 'line_width_1', 'line_width_2', 'line_width_3', 'line_width_4', 'line_width_5', 'line_width_6', 'line_width_7', 'lis', 'local', 'minus', 'mod', 'noir', 'nom_cache', 'non', 'od', 'option', 'otherwise', 'ou', 'pas', 'point_arret', 'point_carre', 'point_croix', 'point_div', 'point_etoile', 'point_invisible', 'point_losange', 'point_milieu', 'point_plus', 'point_point', 'point_polaire', 'point_triangle', 'point_width_1', 'point_width_2', 'point_width_3', 'point_width_4', 'point_width_5', 'point_width_6', 'point_width_7', 'pour', 'proc', 'program', 'quadrant1', 'quadrant2', 'quadrant3', 'quadrant4', 'range', 'redim', 'repeat', 'repete', 'repeter', 'replace', 'restart', 'rouge', 'saisir', 'saisir_chaine', 'sauve', 'save_history', 'scale', 'scaleadd', 'si', 'sinon', 'size', 'stack', 'step', 'switch', 'tantque', 'test', 'textinput', 'then', 'thiele', 'time', 'to', 'union', 'until', 'var', 'vector', 'vers', 'vert', 'vrai', 'watch', 'when', 'white', 'with_sqrt', 'write', 'wz_certificate', 'xor', 'yellow', '{}', '|', '||','expression']
+toremove = ['!', '!=', '#', '$', '%', '/%', '%/', '%{%}', '&&', '&*', '&^', "'", '()', '*', '*=', '+', '-', '+&', '+=', '+infinity', '-<', '-=', '->', '-infinity', '.*', '.+', '.-', './', '.^', '/=', ':=', '<', '<=', '=', '=<', '==', '=>', '>', '>=', '?', '@', '@@', 'ACOSH', 'ACOT', 'ACSC', 'ASEC', 'ASIN', 'ASINH', 'ATAN', 'ATANH', 'COND', 'COS', 'COSH', 'COT', 'CSC', 'CST', 'Celsius2Fahrenheit', 'ClrDraw', 'ClrGraph', 'ClrIO', 'CyclePic', 'DIGITS', 'DOM_COMPLEX', 'DOM_FLOAT', 'DOM_FUNC', 'DOM_IDENT', 'DOM_INT', 'DOM_LIST', 'DOM_RAT', 'DOM_STRING', 'DOM_SYMBOLIC', 'DOM_int', 'DelFold', 'DelVar', 'Det', 'Dialog', 'Digits', 'Disp', 'DispG', 'DispHome', 'DrawFunc', 'DrawInv', 'DrawParm', 'DrawPol', 'DrawSlp', 'DropDown', 'DrwCtour', 'ERROR', 'EXP', 'EndDlog', 'FALSE', 'False', 'Fahrenheit2Celsius', 'Fill', 'Gcd', 'GetFold', 'Graph', 'IFTE', 'Input', 'InputStr', 'Int', 'Inverse', 'LN', 'LQ', 'LSQ', 'NORMALD', 'NewFold', 'NewPic', 'Nullspace', 'Output', 'Ox_2d_unit_vector', 'Ox_3d_unit_vector', 'Oy_2d_unit_vector', 'Oy_3d_unit_vector', 'Oz_3d_unit_vector', 'Pause', 'PopUp', 'Quo', 'REDIM', 'REPLACE', 'RclPic', 'Rem', 'Resultant', 'RplcPic', 'Rref', 'SCALE', 'SCALEADD', 'SCHUR', 'SIN', 'SVD', 'SVL', 'SWAPCOL', 'SWAPROW', 'SetFold', 'Si', 'StoPic', 'Store', 'TAN', 'TRUE', 'True', 'TeX', 'Text', 'Title', 'Unarchiv', 'WAIT', '^', '_(cm/s)', '_(ft/s)', '_(ft*lb)', '_(m/s)', '_(m/s^2)', '_(rad/s)', '_(rad/s^2)', '_(tr/min)', '_(tr/s)', '_A', '_Angstrom', '_Bq', '_Btu', '_Ci', '_F', '_F_', '_Fdy', '_G_', '_Gal', '_Gy', '_H', '_Hz', '_I0_', '_J', '_K', '_Kcal', '_MHz', '_MW', '_MeV', '_N', '_NA_', '_Ohm', '_P', '_PSun_', '_Pa', '_R', '_REarth_', '_RSun_', '_R_', '_Rankine', '_Rinfinity_', '_S', '_St', '_StdP_', '_StdT_', '_Sv', '_T', '_V', '_Vm_', '_W', '_Wb', '_Wh', '_a', '_a0_', '_acre', '_alpha_', '_angl_', '_arcmin', '_arcs', '_atm', '_au', '_b', '_bar', '_bbl', '_bblep', '_bu', '_buUS', '_c3_', '_c_', '_cal', '_cd', '_chain', '_cm', '_cm^2', '_cm^3', '_ct', '_cu', '_d', '_dB', '_deg', '_degreeF', '_dyn', '_eV', '_epsilon0_', '_epsilon0q_', '_epsilonox_', '_epsilonsi_', '_erg', '_f0_', '_fath', '_fbm', '_fc', '_fermi', '_flam', '_fm', '_ft', '_ft*lb', '_ftUS', '_ft^2', '_ft^3', '_g', '_g_', '_ga', '_galC', '_galUK', '_galUS', '_gf', '_gmol', '_gon', '_grad', '_grain', '_h', '_h_', '_ha', '_hbar_', '_hp', '_in', '_inH20', '_inHg', '_in^2', '_in^3', '_j', '_kWh', '_k_', '_kg', '_kip', '_km', '_km^2', '_knot', '_kph', '_kq_', '_l', '_lam', '_lambda0_', '_lambdac_', '_lb', '_lbf', '_lbmol', '_lbt', '_lep', '_liqpt', '_lm', '_lx', '_lyr', '_m', '_mEarth_', '_m^2', '_m^3', '_me_', '_mho', '_miUS', '_miUS^2', '_mi^2', '_mil', '_mile', '_mille', '_ml', '_mm', '_mmHg', '_mn', '_mol', '_mp_', '_mph', '_mpme_', '_mu0_', '_muB_', '_muN_', '_oz', '_ozUK', '_ozfl', '_ozt', '_pc', '_pdl', '_ph', '_phi_', '_pk', '_psi', '_ptUK', '_q_', '_qe_', '_qepsilon0_', '_qme_', '_qt', '_rad', '_rad_', '_rd', '_rem', '_rod', '_rpm', '_s', '_sb', '_sd_', '_sigma_', '_slug', '_sr', '_st', '_syr_', '_t', '_tbsp', '_tec', '_tep', '_tex', '_therm', '_ton', '_tonUK', '_torr', '_tr', '_tsp', '_twopi_', '_u', '_yd', '_yd^2', '_yd^3', '_yr', '_\xc2\xb5', '_µ', 'assert', 'affichage', 'alors', 'animate', 'animate3d', 'animation', 'approx_mode', 'archive', 'args', 'as_function_of', 'asc', 'asec', 'assign', 'backquote', 'begin', 'black', 'blanc', 'bleu', 'bloc', 'blue', 'breakpoint', 'by', 'c1oc2', 'c1op2', 'cache_tortue', 'cap', 'cap_flat_line', 'cap_round_line', 'cap_square_line', 'case', 'cat', 'catch', 'cd', 'choosebox', 'click', 'close', 'complex_mode', 'de', 'del', 'debug', 'default', 'div', 'double', 'ecris', 'efface', 'elif', 'end', 'end_for', 'end_if', 'end_while', 'epaisseur', 'epaisseur_ligne_1', 'epaisseur_ligne_2', 'epaisseur_ligne_3', 'epaisseur_ligne_4', 'epaisseur_ligne_5', 'epaisseur_ligne_6', 'epaisseur_ligne_7', 'epaisseur_point_1', 'epaisseur_point_2', 'epaisseur_point_3', 'epaisseur_point_4', 'epaisseur_point_5', 'epaisseur_point_6', 'epaisseur_point_7', 'erase', 'erase3d', 'est_cocyclique', 'est_inclus', 'et', 'faire', 'faux', 'feuille', 'ffaire', 'ffonction', 'fi', 'filled', 'fin_enregistrement', 'float', 'fonction', 'fopen', 'format', 'fpour', 'frame_3d', 'frames', 'fsi', 'ftantque', 'func', 'function', 'gauche', 'gl_ortho', 'gl_quaternion', 'gl_rotation', 'gl_shownames', 'gl_texture', 'gl_x', 'gl_x_axis_color', 'gl_x_axis_name', 'gl_x_axis_unit', 'gl_xtick', 'gl_y', 'gl_y_axis_color', 'gl_y_axis_name', 'gl_y_axis_unit', 'gl_ytick', 'gl_z', 'gl_z_axis_color', 'gl_z_axis_name', 'gl_z_axis_unit', 'gl_ztick', 'gnuplot', 'goto', 'graph2tex', 'graph3d2tex', 'graphe', 'graphe3d', 'graphe_probabiliste', 'graphe_suite', 'green', 'grid_paper', 'hidden_name', 'identifier', 'ifft', 'ifte', 'inputform', 'intersect', 'is_included', 'jusqu_a', 'jusqua', 'jusque', 'keep_algext', 'kill', 'label', 'labels', 'len', 'leve_crayon', 'line_width_1', 'line_width_2', 'line_width_3', 'line_width_4', 'line_width_5', 'line_width_6', 'line_width_7', 'lis', 'local', 'minus', 'mod', 'noir', 'nom_cache', 'non', 'od', 'option', 'otherwise', 'ou', 'pas', 'point_arret', 'point_carre', 'point_croix', 'point_div', 'point_etoile', 'point_invisible', 'point_losange', 'point_milieu', 'point_plus', 'point_point', 'point_polaire', 'point_triangle', 'point_width_1', 'point_width_2', 'point_width_3', 'point_width_4', 'point_width_5', 'point_width_6', 'point_width_7', 'pour', 'proc', 'program', 'quadrant1', 'quadrant2', 'quadrant3', 'quadrant4', 'range', 'redim', 'repeat', 'repete', 'repeter', 'replace', 'restart', 'rouge', 'saisir', 'saisir_chaine', 'sauve', 'save_history', 'scale', 'scaleadd', 'si', 'sinon', 'size', 'stack', 'step', 'switch', 'tantque', 'test', 'textinput', 'then', 'thiele', 'time', 'to', 'union', 'until', 'var', 'vector', 'vers', 'vert', 'vrai', 'watch', 'when', 'white', 'with_sqrt', 'write', 'wz_certificate', 'xor', 'yellow', '{}', '|', '||','expression']
 
 
 

diff --git a/src/sage_setup/autogen/interpreters/specs/base.py b/src/sage_setup/autogen/interpreters/specs/base.py
@@ -112,18 +112,18 @@ def __init__(self, type, mc_retval=None):
         Initializes the fields described in the documentation for
         InterpreterSpec.__init__, as well as the following:
 
-        mc_args, mc_constants, mc_stack -- MemoryChunk values
-        return_type -- the type returned by the C interpreter (None for int,
-                       where 1 means success and 0 means error)
-        mc_retval -- None, or the MemoryChunk to use as a return value
-        ipow_range -- the range of exponents supported by the ipow
-                      instruction (default is False, meaning never use ipow)
-        adjust_retval -- None, or a string naming a function to call
-                         in the wrapper's __call__ to modify the return
-                         value of the interpreter
-        implement_call_c -- True if the wrapper should have a fast cdef call_c
-                            method (that bypasses the Python call overhead)
-                            (default True)
+        - mc_args, mc_constants, mc_stack -- MemoryChunk values
+        - return_type -- the type returned by the C interpreter (None for int,
+          where 1 means success and 0 means error)
+        - mc_retval -- None, or the MemoryChunk to use as a return value
+        - ipow_range -- the range of exponents supported by the ipow
+          instruction (default is False, meaning never use ipow)
+        - adjust_retval -- None, or a string naming a function to call
+          in the wrapper's __call__ to modify the return
+          value of the interpreter
+        - implement_call_c -- True if the wrapper should have a fast cdef call_c
+          method (that bypasses the Python call overhead)
+          (default True)
 
         EXAMPLES::
 

diff --git a/src/tox.ini b/src/tox.ini
@@ -25,6 +25,10 @@ envlist = doctest, coverage, startuptime, pycodestyle-minimal, relint, codespell
 # When adding environments above, also update the delegations in SAGE_ROOT/tox.ini
 skipsdist = true
 
+requires =
+    # For the renamed "allowlist_externals" keyword
+    tox>=3.18
+
 [sagedirect]
 # Base for tox environments that bypass the virtual environment set up by tox,
 # calling sage directly.
@@ -125,9 +129,9 @@ description =
 # https://github.com/codingjoe/relint
 # The patterns are in .relint.yml
 deps = relint
-whitelist_externals = find
+allowlist_externals = find
 commands = find {posargs:{toxinidir}/sage/} \
-    -name "*#*" -prune -o \
+    -name "*\#*" -prune -o \
     -name "*.a" -prune -o \
     -name "*.bak" -prune -o \
     -name "*.bz2" -prune -o \

diff --git a/tox.ini b/tox.ini
@@ -128,6 +128,9 @@ envlist =
     #
     # pycodestyle
 
+requires =
+    # For the renamed "allowlist_externals" keyword
+    tox>=3.18
 
 skipsdist = true
 
@@ -583,7 +586,7 @@ setenv =
 platform =
     local-macos:   darwin
 
-whitelist_externals =
+allowlist_externals =
                    bash
     docker:        docker
     homebrew:      brew
@@ -685,7 +688,7 @@ commands =
 
 [testenv:check_configure]
 ## Test that configure behaves properly
-whitelist_externals =
+allowlist_externals =
     bash
 setenv =
     HOME = {envdir}
@@ -698,7 +701,7 @@ commands =
 passenv =
     HOME
 envdir   = {toxworkdir}/src
-whitelist_externals = tox
+allowlist_externals = tox
 commands = tox -c {toxinidir}/src/tox.ini -e {envname} -- {posargs}
 
 [testenv:doctest]
@@ -707,54 +710,54 @@ description =
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:coverage]
 description =
     give information about doctest coverage of files (same as "sage --coverage[all]")
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:startuptime]
 description =
     display how long each component of Sage takes to start up (same as "sage --startuptime")
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:pycodestyle]
 description =
     check against the Python style conventions of PEP8
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:pycodestyle-minimal]
 description =
     check against Sage's minimal style conventions
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:relint]
 description =
     check whether some forbidden patterns appear - similar to patchbot plugins
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:codespell]
 description =
     check for misspelled words in source code (use -w -i to fix)
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 # Run on the whole project, not just src/ by default, if invoked directly at top level
 commands = tox -c {toxinidir}/src/tox.ini -e {envname} -- {posargs:{toxinidir}}
 
@@ -764,12 +767,12 @@ description =
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}
 
 [testenv:rst]
 description =
     validate Python docstrings markup as reStructuredText
 passenv  = {[sage_src]passenv}
 envdir   = {[sage_src]envdir}
 commands = {[sage_src]commands}
-whitelist_externals = {[sage_src]whitelist_externals}
+allowlist_externals = {[sage_src]allowlist_externals}