pkgs/sagemath-standard/tox.ini: Use SAGE_VENV or venv symlink to find…

… wheels
sagemath · Nov 23, 2021 · 9375ef8 · 9375ef8
1 parent 77c957f
commit 9375ef8
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/pkgs/sagemath-standard/tox.ini b/pkgs/sagemath-standard/tox.ini
@@ -25,15 +25,15 @@ envlist =
     # Build dependencies according to requirements.txt (all versions fixed).
     # Use ONLY the wheels built and stored by the Sage distribution (no PyPI):
     #
-    #   ./sage -sh -c '(cd pkgs/sagelib && tox -v -v -v -e python-sagewheels-nopypi)'
+    #   ./sage -sh -c '(cd pkgs/sagemath-standard && tox -v -v -v -e python-sagewheels-nopypi)'
     #
     python-sagewheels-nopypi,
     #
     # Build and test without using the concrete dependencies specified by requirements.txt,
     # using the dependencies declared in pyproject.toml and setup.cfg (install-requires) only:
     # Still use ONLY the wheels built and stored by the Sage distribution (no PyPI).
     #
-    #   ./sage -sh -c '(cd pkgs/sagelib && tox -v -v -v -e python-sagewheels-nopypi-norequirements)'
+    #   ./sage -sh -c '(cd pkgs/sagemath-standard && tox -v -v -v -e python-sagewheels-nopypi-norequirements)'
     #
     python-sagewheels-nopypi-norequirements,
     #
@@ -44,7 +44,7 @@ envlist =
     # and additionally allow packages from PyPI.
     # Because all versions are fixed, we "should" end up using the prebuilt wheels.
     #
-    #   ./sage -sh -c '(cd pkgs/sagelib && tox -v -v -v -e python-sagewheels)'
+    #   ./sage -sh -c '(cd pkgs/sagemath-standard && tox -v -v -v -e python-sagewheels)'
     #
     python-sagewheels,
     #
@@ -81,8 +81,8 @@ passenv =
                              PKG_CONFIG_PATH
     # Parallel build
                              SAGE_NUM_THREADS
-    # SAGE_LOCAL only for finding the wheels
-    sagewheels:              SAGE_LOCAL
+    # SAGE_VENV only for finding the wheels
+    sagewheels:              SAGE_VENV
     # Location of the wheels (needs to include a PEP 503 compliant
     # Simple Repository index, i.e., a subdirectory "simple")
     sagewheels:              SAGE_SPKG_WHEELS
@@ -92,7 +92,7 @@ setenv =
     HOME={envdir}
     # We supply pip options by environment variables so that they
     # apply both to the installation of the dependencies and of the package
-    sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_LOCAL:{toxinidir}/../../../../local}/var/lib/sage/wheels}
+    sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
     # No build isolation for PEP 517 packages - use what is already in the environment
     # Note that this pip env "NO" variable uses inverted logic: