From 64b212caa93f9e9c4f0868eb065bb35fd22cfc6a Mon Sep 17 00:00:00 2001
From: Matthias Koeppe <mkoeppe@math.ucdavis.edu>
Date: Tue, 26 Jul 2022 11:05:28 -0700
Subject: [PATCH] pkgs/sagemath-*/tox.ini: Make sagepython-norequirements
 actually use sage python

---
 pkgs/sagemath-categories/tox.ini  | 12 +++++++-----
 pkgs/sagemath-environment/tox.ini | 11 +++++++----
 pkgs/sagemath-objects/tox.ini     | 11 +++++++----
 pkgs/sagemath-repl/tox.ini        | 11 +++++++----
 pkgs/sagemath-standard/tox.ini    |  2 +-
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/sagemath-categories/tox.ini b/pkgs/sagemath-categories/tox.ini
index 60cdfe4ca7c..7ac63bae0ec 100644
--- a/pkgs/sagemath-categories/tox.ini
+++ b/pkgs/sagemath-categories/tox.ini
@@ -19,13 +19,15 @@ setenv =
     HOME={envdir}
 
 passenv =
-    SAGE_NUM_THREADS
-    SAGE_NUM_THREADS_PARALLEL
+    # Parallel build
+                             SAGE_NUM_THREADS
+                             SAGE_NUM_THREADS_PARALLEL
+    # SAGE_VENV only for referring to the basepython
+    sagepython:              SAGE_VENV
 
 whitelist_externals =
     bash
 
-
 commands =
     # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package.
     {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.cpython.builtin_types, sage.cpython.cython_metaclass, sage.cpython.debug, sage.structure.all, sage.categories.all'
@@ -36,7 +38,7 @@ commands =
     bash -c 'cd bin && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --environment=sage.all__sagemath_categories --optional=sage $SAGE_SRC/sage/structure  || echo "(lots of doctest failures are expected)"'
 
 [testenv:sagepython]
-passenv =
-    SAGE_VENV
+basepython = {env:SAGE_VENV}/bin/python3
 
+[testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
diff --git a/pkgs/sagemath-environment/tox.ini b/pkgs/sagemath-environment/tox.ini
index 7f08078d74e..890ffdf0015 100644
--- a/pkgs/sagemath-environment/tox.ini
+++ b/pkgs/sagemath-environment/tox.ini
@@ -21,8 +21,11 @@ setenv =
     HOME={envdir}
 
 passenv =
-    SAGE_NUM_THREADS
-    SAGE_NUM_THREADS_PARALLEL
+    # Parallel build
+                             SAGE_NUM_THREADS
+                             SAGE_NUM_THREADS_PARALLEL
+    # SAGE_VENV only for referring to the basepython
+    sagepython:              SAGE_VENV
 
 whitelist_externals =
     bash
@@ -32,7 +35,7 @@ commands =
     {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); from sage.features.all import all_features; print(sorted(all_features(), key=lambda x: x.name)); import sage.misc.package'
 
 [testenv:sagepython]
-passenv =
-    SAGE_VENV
+basepython = {env:SAGE_VENV}/bin/python3
 
+[testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
diff --git a/pkgs/sagemath-objects/tox.ini b/pkgs/sagemath-objects/tox.ini
index 727254cf844..e03cbab1c3c 100644
--- a/pkgs/sagemath-objects/tox.ini
+++ b/pkgs/sagemath-objects/tox.ini
@@ -19,8 +19,11 @@ setenv =
     HOME={envdir}
 
 passenv =
-    SAGE_NUM_THREADS
-    SAGE_NUM_THREADS_PARALLEL
+    # Parallel build
+                             SAGE_NUM_THREADS
+                             SAGE_NUM_THREADS_PARALLEL
+    # SAGE_VENV only for referring to the basepython
+    sagepython:              SAGE_VENV
 
 whitelist_externals =
     bash
@@ -34,7 +37,7 @@ commands =
     #bash -c 'cd bin && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --environment=sage.all__sagemath_objects --optional=sage $SAGE_SRC/sage/structure || echo "(lots of doctest failures are expected)"'
 
 [testenv:sagepython]
-passenv =
-    SAGE_VENV
+basepython = {env:SAGE_VENV}/bin/python3
 
+[testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
diff --git a/pkgs/sagemath-repl/tox.ini b/pkgs/sagemath-repl/tox.ini
index d766fa55f74..a7e321104cd 100644
--- a/pkgs/sagemath-repl/tox.ini
+++ b/pkgs/sagemath-repl/tox.ini
@@ -21,8 +21,11 @@ setenv =
     HOME={envdir}
 
 passenv =
-    SAGE_NUM_THREADS
-    SAGE_NUM_THREADS_PARALLEL
+    # Parallel build
+                             SAGE_NUM_THREADS
+                             SAGE_NUM_THREADS_PARALLEL
+    # SAGE_VENV only for referring to the basepython
+    sagepython:              SAGE_VENV
 
 whitelist_externals =
     bash
@@ -34,7 +37,7 @@ commands =
     bash -c 'cd bin && SAGE_SRC=$({envpython} -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --environment=sage.all__sagemath_repl --optional=sage $SAGE_SRC/sage/repl $SAGE_SRC/sage/doctest $SAGE_SRC/sage/misc/sage_input.py $SAGE_SRC/sage/misc/sage_eval.py || echo "(lots of doctest failures are expected)"'
 
 [testenv:sagepython]
-passenv =
-    SAGE_VENV
+basepython = {env:SAGE_VENV}/bin/python3
 
+[testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
diff --git a/pkgs/sagemath-standard/tox.ini b/pkgs/sagemath-standard/tox.ini
index b80af350be4..75e72ae32bd 100644
--- a/pkgs/sagemath-standard/tox.ini
+++ b/pkgs/sagemath-standard/tox.ini
@@ -82,7 +82,7 @@ passenv =
                              PKG_CONFIG_PATH
     # Parallel build
                              SAGE_NUM_THREADS
-    # SAGE_VENV only for finding the wheels
+    # SAGE_VENV only for referring to the basepython or finding the wheels
     sagepython, sagewheels:  SAGE_VENV
     # Location of the wheels (needs to include a PEP 503 compliant
     # Simple Repository index, i.e., a subdirectory "simple")