Skip to content

Commit c2be172

Browse files
author
Matthias Koeppe
committed
tox.ini (local-conda-environment): Update for versioned environment-... files
1 parent 5c0bac8 commit c2be172

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

tox.ini

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,9 +527,14 @@ setenv =
527527
local-conda-miniconda: CONDA_INSTALLER_FILE=Miniconda3-latest-{env:CONDA_OS}-x86_64.sh
528528
local-conda: SETENV=. {env:CONDA_PREFIX}/bin/activate base
529529
local-conda-environment: CONDA_SAGE_ENVIRONMENT=sage-build
530-
local-conda-environment: CONDA_SAGE_ENVIRONMENT_FILE=environment.yml
531-
local-conda-environment-optional: CONDA_SAGE_ENVIRONMENT_FILE=environment-optional.yml
530+
local-conda-environment: CONDA_SAGE_ENVIRONMENT_DIR=
531+
local-conda-environment-src: CONDA_SAGE_ENVIRONMENT=sage
532532
local-conda-environment-src: CONDA_SAGE_ENVIRONMENT_DIR=src/
533+
local-conda-environment: CONDA_SAGE_ENVIRONMENT_FILE=environment-{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}.yml
534+
local-conda-environment-optional: CONDA_SAGE_ENVIRONMENT_FILE=environment-optional-{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}.yml
535+
local-conda-environment-dev: CONDA_SAGE_ENVIRONMENT=sage-dev
536+
local-conda-environment-dev: CONDA_SAGE_ENVIRONMENT_DIR=src/
537+
local-conda-environment-dev: CONDA_SAGE_ENVIRONMENT_FILE=environment-dev-{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}.yml
533538
local-conda-environment: SETENV_CONFIGURE=( {env:CONDA_PREFIX}/bin/conda env create -n {env:CONDA_SAGE_ENVIRONMENT} --file {env:CONDA_SAGE_ENVIRONMENT_DIR:}{env:CONDA_SAGE_ENVIRONMENT_FILE} || {env:CONDA_PREFIX}/bin/conda env update -n {env:CONDA_SAGE_ENVIRONMENT} --file {env:CONDA_SAGE_ENVIRONMENT_DIR:}{env:CONDA_SAGE_ENVIRONMENT_FILE} ) && . {env:CONDA_PREFIX}/bin/activate {env:CONDA_SAGE_ENVIRONMENT}
534539
#
535540
# Configuration factors

0 commit comments

Comments
 (0)