Skip to content

Commit 70da140

Browse files
committed
Merge branch 'u/chapoton/support_tox_4' in 9.8.b6
2 parents 2114066 + 9d76204 commit 70da140

File tree

6 files changed

+43
-35
lines changed

6 files changed

+43
-35
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install relint
3636
run: pip install tox relint
3737
- name: Lint using relint
38-
run: tox -e relint src/sage/
38+
run: tox -e relint -- src/sage/
3939
lint-rst:
4040
name: Validate docstring markup as RST
4141
runs-on: ubuntu-latest

src/sage_docbuild/ext/sage_autodoc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def identity(x: Any) -> Any:
9797

9898

9999
class _All:
100-
"""A special value for :*-members: that matches to any member."""
100+
"""A special value for ``:*-members:`` that matches to any member."""
101101

102102
def __contains__(self, item: Any) -> bool:
103103
return True

src/sage_setup/autogen/giacpy-mkkeywords.py

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
#see the discussion in trac #29171 about where to store this file.
1+
# see the discussion in trac #29171 about where to store this file.
22
"""
33
This file is to help the maintainer to upgrade the giac keywords in
44
55
giacpy or giacpy_sage or sage.libs.giac
66
7-
it creates auto-methods.pxi, keywords.pxi, newkeyword.pxi
8-
it needs: the cas_help program from a giac installation
9-
the aide_cas.txt file that you can built yourself like this:
7+
It creates auto-methods.pxi, keywords.pxi, newkeyword.pxi
8+
It needs:
109
11-
grep -E '^#' share/giac/doc/aide_cas |sed -e 's/^# //' >aide_cas.txt
10+
- the ``cas_help`` program from a giac installation
11+
- the ``aide_cas.txt`` file that you can built yourself like this::
1212
13+
grep -E '^#' share/giac/doc/aide_cas |sed -e 's/^# //' >aide_cas.txt
1314
1415
It should not be used on the fly for an automatic installation script, because auto-methods.pxi is
1516
quite long to be built and adding new giac keywords often break the built of giacpy
@@ -23,9 +24,9 @@
2324
"""
2425
from subprocess import PIPE, Popen
2526

26-
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', '[..]']
27+
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', '[..]']
2728

28-
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']
29+
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']
2930

3031

3132

src/sage_setup/autogen/interpreters/specs/base.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,18 +112,18 @@ def __init__(self, type, mc_retval=None):
112112
Initializes the fields described in the documentation for
113113
InterpreterSpec.__init__, as well as the following:
114114
115-
mc_args, mc_constants, mc_stack -- MemoryChunk values
116-
return_type -- the type returned by the C interpreter (None for int,
117-
where 1 means success and 0 means error)
118-
mc_retval -- None, or the MemoryChunk to use as a return value
119-
ipow_range -- the range of exponents supported by the ipow
120-
instruction (default is False, meaning never use ipow)
121-
adjust_retval -- None, or a string naming a function to call
122-
in the wrapper's __call__ to modify the return
123-
value of the interpreter
124-
implement_call_c -- True if the wrapper should have a fast cdef call_c
125-
method (that bypasses the Python call overhead)
126-
(default True)
115+
- mc_args, mc_constants, mc_stack -- MemoryChunk values
116+
- return_type -- the type returned by the C interpreter (None for int,
117+
where 1 means success and 0 means error)
118+
- mc_retval -- None, or the MemoryChunk to use as a return value
119+
- ipow_range -- the range of exponents supported by the ipow
120+
instruction (default is False, meaning never use ipow)
121+
- adjust_retval -- None, or a string naming a function to call
122+
in the wrapper's __call__ to modify the return
123+
value of the interpreter
124+
- implement_call_c -- True if the wrapper should have a fast cdef call_c
125+
method (that bypasses the Python call overhead)
126+
(default True)
127127
128128
EXAMPLES::
129129

src/tox.ini

Lines changed: 6 additions & 2 deletions
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.
@@ -125,9 +129,9 @@ description =
125129
# https://github.com/codingjoe/relint
126130
# The patterns are in .relint.yml
127131
deps = relint
128-
whitelist_externals = find
132+
allowlist_externals = find
129133
commands = find {posargs:{toxinidir}/sage/} \
130-
-name "*#*" -prune -o \
134+
-name "*\#*" -prune -o \
131135
-name "*.a" -prune -o \
132136
-name "*.bak" -prune -o \
133137
-name "*.bz2" -prune -o \

tox.ini

Lines changed: 15 additions & 12 deletions
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)