tox.ini: Do not set environment variable CONDARC

sagemath · Dec 21, 2021 · 049a5f6 · 049a5f6
1 parent 591be34
commit 049a5f6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tox.ini b/tox.ini
@@ -302,9 +302,9 @@ setenv =
     # https://hub.docker.com/r/continuumio
     #
     conda:            SYSTEM=conda
-    conda:                                                      CONDARC=/dev/null
+    conda:                                                      USE_CONDARC=/dev/null
     conda-forge:        BASE_IMAGE=continuumio/miniconda3
-    conda-forge:                                                CONDARC=condarc.yml
+    conda-forge:                                                USE_CONDARC=condarc.yml
     conda-forge:                               IGNORE_MISSING_SYSTEM_PACKAGES=no
     conda-anaconda3:    BASE_IMAGE=continuumio/anaconda3
     conda-anaconda3:                           IGNORE_MISSING_SYSTEM_PACKAGES=yes
@@ -559,7 +559,7 @@ commands =
     local-conda:   bash -c 'mkdir -p {env:SHARED_CACHE_DIR}/conda_pkgs {env:CONDA_PREFIX}'
     local-conda:   bash -c 'echo >  {env:CONDA_PREFIX}/.condarc "pkgs_dirs:"'
     local-conda:   bash -c 'echo >> {env:CONDA_PREFIX}/.condarc "  - {env:SHARED_CACHE_DIR}/conda_pkgs"'
-    local-conda:   bash -c 'cat {env:CONDARC} >> {env:CONDA_PREFIX}/.condarc'
+    local-conda:   bash -c 'cat {env:USE_CONDARC} >> {env:CONDA_PREFIX}/.condarc'
     local-conda:   bash -c 'if [ ! -x {env:CONDA_PREFIX}/bin/conda ]; then mkdir {env:CONDA_PREFIX}/conda-meta && curl -L {env:CONDA_INSTALLER_URL_BASE}{env:CONDA_INSTALLER_FILE} -C - -o {env:SHARED_CACHE_DIR}/{env:CONDA_INSTALLER_FILE} && bash {env:SHARED_CACHE_DIR}/{env:CONDA_INSTALLER_FILE} -b -f -p {env:CONDA_PREFIX}; fi'
     local-conda:   bash -c 'case "{env:SKIP_SYSTEM_PKG_INSTALL:}" in 1|y*|Y*);; *) {env:SETENV} && {env:CONDA_PREFIX}/bin/conda update -n base --yes conda;; esac'
     local-conda:   bash -c 'PACKAGES=$(build/bin/sage-get-system-packages conda $(PATH=build/bin:$PATH build/bin/sage-package list {env:SAGE_PACKAGE_LIST_ARGS}) {env:EXTRA_SAGE_PACKAGES}); {env:SETENV} && {env:CONDA_PREFIX}/bin/conda install --yes --quiet $PACKAGES'
@@ -594,7 +594,7 @@ commands =
     docker:              --tag $BUILD_TAG \
     docker:              --build-arg EXTRA_CONFIGURE_ARGS="{env:CONFIGURE_ARGS}" \
     docker:              --build-arg BASE_IMAGE={env:FULL_BASE_IMAGE_AND_TAG} \
-    docker-conda:        --build-arg USE_CONDARC="{env:CONDARC}" \
+    docker-conda:        --build-arg USE_CONDARC="{env:USE_CONDARC}" \
     docker:              --build-arg BOOTSTRAP="{env:BOOTSTRAP}" \
     docker:              --build-arg TARGETS_PRE="$(if test -n "$TARGETS_PRE"; then echo $TARGETS_PRE; else echo {posargs:all-sage-local}; fi)" \
     docker:              --build-arg TARGETS="{posargs:build}" \