From 0535b2731191f250af0226d866734044e3c6ca82 Mon Sep 17 00:00:00 2001 From: Matthew Newville Date: Fri, 10 Jan 2025 09:06:13 -0600 Subject: [PATCH] update installer scripts for latest miniforge --- installers/GetLarch.bat | 2 +- installers/GetLarch.sh | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/installers/GetLarch.bat b/installers/GetLarch.bat index fb82a29e9..4fb249d72 100644 --- a/installers/GetLarch.bat +++ b/installers/GetLarch.bat @@ -19,7 +19,7 @@ echo ## basic mamba installed, running updates set PATH=%prefix%;%prefix%\bin;%prefix%\condabin;%prefix%\Scripts;%PATH% echo ## Installing basic python scipy packages -call %prefix%\Scripts\mamba install -yc conda-forge python==3.11.5 numpy scipy matplotlib h5py scikit-image scikit-learn pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy +call %prefix%\Scripts\mamba install -yc conda-forge python==3.12.7 numpy scipy matplotlib h5py scikit-image scikit-learn pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy echo ## Installing xraylarch and dependencies from PyPI call %prefix%\Scripts\pip install xraylarch[larix] diff --git a/installers/GetLarch.sh b/installers/GetLarch.sh index 7d8ef2efe..5f40efbfb 100644 --- a/installers/GetLarch.sh +++ b/installers/GetLarch.sh @@ -8,19 +8,15 @@ prefix=$HOME/xraylarch larchurl='xraylarch[larix]' uname=`uname` -if [ $uname == Darwin ]; then - uname=MacOSX -fi - condaurl="https://github.com/conda-forge/miniforge/releases/latest/download" condafile="Miniforge3-$uname-x86_64.sh" -condafile="Mambaforge-$uname-x86_64.sh" logfile=GetLarch.log ## set list of conda packages to install from conda-forge -cforge_pkgs="python=>3.12.3 numpy scipy matplotlib h5py scikit-image scikit-learn pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy" +cforge_pkgs="python=>3.12.7 numpy scipy matplotlib h5py scikit-image scikit-learn pandas jupyter plotly wxpython fabio pyfai pymatgen mkl_fft tomopy" + unset CONDA_EXE CONDA_PYTHON_EXE CONDA_PREFIX PROJ_LIB