Skip to content

Commit c11892e

Browse files
author
Matthias Koeppe
committed
tox.ini (local-conda): Use 'uname -m' to determine arch for installer
1 parent bf0ed40 commit c11892e

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tox.ini

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,10 +542,11 @@ setenv =
542542
local-conda: PATH={env:CONDA_PREFIX}/bin:/usr/bin:/bin:/usr/sbin:/sbin
543543
local-conda: CONDA_PKGS_DIRS={env:SHARED_CACHE_DIR}/conda_pkgs
544544
local-conda: CONDA_OS=$(uname | sed 's/^Darwin/MacOSX/;')
545+
local-conda: CONDA_ARCH=$(uname -m)
545546
local-conda-forge: CONDA_INSTALLER_URL_BASE=https://github.com/conda-forge/miniforge/releases/latest/download/
546-
local-conda-forge: CONDA_INSTALLER_FILE=Miniforge3-{env:CONDA_OS}-x86_64.sh
547+
local-conda-forge: CONDA_INSTALLER_FILE=Miniforge3-{env:CONDA_OS}-{env:CONDA_ARCH}.sh
547548
local-conda-miniconda: CONDA_INSTALLER_URL_BASE=https://repo.anaconda.com/miniconda/
548-
local-conda-miniconda: CONDA_INSTALLER_FILE=Miniconda3-latest-{env:CONDA_OS}-x86_64.sh
549+
local-conda-miniconda: CONDA_INSTALLER_FILE=Miniconda3-latest-{env:CONDA_OS}-{env:CONDA_ARCH}.sh
549550
local-conda: SETENV=. {env:CONDA_PREFIX}/bin/activate base
550551
local-conda-environment: CONDA_SAGE_ENVIRONMENT=sage-build
551552
local-conda-environment: CONDA_SAGE_ENVIRONMENT_DIR=

0 commit comments

Comments
 (0)