Merge sagemath#34849

Author: mkoeppe

build/pkgs/tox/spkg-configure.m4

@@ -1,17 +1,28 @@
 SAGE_SPKG_CONFIGURE([tox], [
        dnl Use non-ancient tox with full support for PEP 517.
-       m4_pushdef([TOX_MIN_VERSION], [3.21.4])
-       AC_CACHE_CHECK([for tox >= ]TOX_MIN_VERSION, [ac_cv_path_TOX], [
+       m4_pushdef([TOX3_MIN_VERSION], [3.21.4])
+       dnl Early 4.0.x versions have bugs regarding complex factor conditions
+       m4_pushdef([TOX4_MIN_VERSION], [4.0.15])
+       AC_CACHE_CHECK([for tox 3 >= ]TOX3_MIN_VERSION[ or tox 4 >= ]TOX4_MIN_VERSION, [ac_cv_path_TOX], [
          AC_PATH_PROGS_FEATURE_CHECK([TOX], [tox], [
             tox_version=$($ac_path_TOX --version 2> /dev/null | tail -1)
             AS_IF([test -n "$tox_version"], [
-                AX_COMPARE_VERSION([$tox_version], [ge], TOX_MIN_VERSION, [
-                    ac_cv_path_TOX="$ac_path_TOX"
-                    ac_path_TOX_found=:
+                AX_COMPARE_VERSION([$tox_version], [lt], [4], [
+                    AX_COMPARE_VERSION([$tox_version], [ge], TOX3_MIN_VERSION, [
+                        ac_cv_path_TOX="$ac_path_TOX"
+                        ac_path_TOX_found=:
+                    ])
+                ], [
+                    AX_COMPARE_VERSION([$tox_version], [ge], TOX4_MIN_VERSION, [
+                        ac_cv_path_TOX="$ac_path_TOX"
+                        ac_path_TOX_found=:
+                    ])
                 ])
             ])
          ])
        ])
        AS_IF([test -z "$ac_cv_path_TOX"],
              [sage_spkg_install_tox=yes])
+       m4_popdef([TOX4_MIN_VERSION])
+       m4_popdef([TOX3_MIN_VERSION])
 ])

pkgs/sage-docbuild/tox.ini

@@ -15,7 +15,7 @@ setenv =
     # Sage scripts like to use $HOME/.sage
     HOME={envdir}
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 commands =

pkgs/sage-setup/tox.ini

@@ -19,7 +19,7 @@ setenv =
     # Sage scripts such as sage-runtests like to use $HOME/.sage
     HOME={envdir}
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 commands =

pkgs/sage-sws2rst/tox.ini

@@ -11,7 +11,7 @@
 [testenv]
 deps = -rrequirements.txt
 
-whitelist_externals =
+allowlist_externals =
     ./check.sh
 
 commands =

pkgs/sagemath-categories/tox.ini

@@ -39,7 +39,7 @@ setenv =
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 commands =

pkgs/sagemath-environment/tox.ini

@@ -33,7 +33,7 @@ setenv =
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 commands =

pkgs/sagemath-objects/tox.ini

@@ -37,7 +37,7 @@ setenv =
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 commands =

pkgs/sagemath-repl/tox.ini

@@ -37,7 +37,7 @@ setenv =
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 commands =

pkgs/sagemath-standard/tox.ini

@@ -107,7 +107,7 @@ sitepackages =
     sitepackages:            True
     !sitepackages:           False
 
-whitelist_externals =
+allowlist_externals =
     bash
 
 skip_install =

src/tox.ini

@@ -37,6 +37,8 @@ passenv =
 setenv =
     SAGE={toxinidir}/../sage
 envdir={toxworkdir}/sagedirect
+allowlist_externals =
+    {env:SAGE}
 
 [testenv:doctest]
 description =
@@ -45,6 +47,7 @@ description =
 passenv = {[sagedirect]passenv}
 setenv  = {[sagedirect]setenv}
 envdir  = {[sagedirect]envdir}
+allowlist_externals = {[sagedirect]allowlist_externals}
 commands =
     {env:SAGE} -t -p 0 {posargs:--all}
 
@@ -56,6 +59,7 @@ description =
 passenv = {[sagedirect]passenv}
 setenv  = {[sagedirect]setenv}
 envdir  = {[sagedirect]envdir}
+allowlist_externals = {[sagedirect]allowlist_externals}
 commands =
     {env:SAGE} --coverage {posargs:--all}
 
@@ -67,6 +71,7 @@ description =
 passenv = {[sagedirect]passenv}
 setenv  = {[sagedirect]setenv}
 envdir  = {[sagedirect]envdir}
+allowlist_externals = {[sagedirect]allowlist_externals}
 commands =
     {env:SAGE} --startuptime {posargs}
 
@@ -75,17 +80,19 @@ description =
     run the static typing checker pyright
 deps = pyright
 setenv =
+    {[sagedirect]setenv}
     HOME={envdir}
     # Fix version, see .github/workflows/build.yml
     PYRIGHT_PYTHON_FORCE_VERSION=1.1.232
+allowlist_externals = {[sagedirect]allowlist_externals}
 ## We run pyright from within the sage-env so that SAGE_LOCAL is available.
 ## pyright is already configured via SAGE_ROOT/pyrightconfig.json to use our venv.
 ##
 ## Running pyright on the whole Sage source tree takes very long
 ## and may run out of memory. When no files/directories are given, just run it
 ## on the packages that already have typing annotations.
 commands =
-    {toxinidir}/../sage -sh -c 'pyright {posargs:{toxinidir}/sage/combinat {toxinidir}/sage/manifolds}'
+    {env:SAGE} -sh -c 'pyright {posargs:{toxinidir}/sage/combinat {toxinidir}/sage/manifolds}'
 
 [testenv:pycodestyle]
 description =
@@ -168,7 +175,7 @@ description =
 # https://pypi.org/project/codespell/
 deps = codespell
 commands = codespell \
-    --skip="*#*,*.a,*.bak,*.bz2,*.dia,*.gz,*.ico,*.inv,*.JPEG,*.jpeg" \
+    --skip="*\#*,*.a,*.bak,*.bz2,*.dia,*.gz,*.ico,*.inv,*.JPEG,*.jpeg" \
     --skip="*.JPG,*.jpg,*.log,*.o,*.orig,*.PDF,*.pdf,*.PNG,*.png,*.pyc" \
     --skip="*.so,*.sobj,*.sws,*.tar,*.tgz,*.xz,*.zip,*~*,.DS_Store" \
     --skip="doc/ca,doc/de,doc/es,doc/fr,doc/hu,doc/it,doc/ja,doc/pt,doc/ru,doc/tr" \

tox.ini

@@ -129,8 +129,8 @@ envlist =
     # pycodestyle
 
 requires =
-    # For the renamed "allowlist_externals" keyword
-    tox>=3.18
+    # For repaired numerical factors in tox 4:
+    tox>=4.2.7
 
 skipsdist = true