From 83035302f29d62089578f93429b33a07c91f6ac0 Mon Sep 17 00:00:00 2001 From: Valeriu Predoi Date: Wed, 16 Oct 2024 15:04:46 +0100 Subject: [PATCH] Retire mambaforge - addendum to 3774 (#3778) --- .circleci/config.yml | 10 +++++----- doc/sphinx/source/quickstart/installation.rst | 6 +++--- doc/sphinx/source/utils.rst | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.dev | 2 +- docker/Dockerfile.exp | 2 +- esmvaltool/utils/batch-jobs/generate.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5957a5e7e3..eb13a0ef08 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -158,7 +158,7 @@ jobs: test_installation_from_source_test_mode: # Test installation from source docker: - - image: condaforge/mambaforge:latest + - image: condaforge/miniforge3:latest resource_class: large steps: - test_installation_from_source: @@ -167,7 +167,7 @@ jobs: test_installation_from_source_develop_mode: # Test development installation docker: - - image: condaforge/mambaforge:latest + - image: condaforge/miniforge3:latest resource_class: large steps: - test_installation_from_source: @@ -179,7 +179,7 @@ jobs: # purpose of this test to discover backward-incompatible changes early on in # the development cycle. docker: - - image: condaforge/mambaforge:latest + - image: condaforge/miniforge3:latest resource_class: large steps: - run: @@ -233,7 +233,7 @@ jobs: build_documentation: # Test building documentation docker: - - image: condaforge/mambaforge:latest + - image: condaforge/miniforge3:latest resource_class: medium steps: - checkout @@ -257,7 +257,7 @@ jobs: test_installation_from_conda: # Test conda package installation docker: - - image: condaforge/mambaforge:latest + - image: condaforge/miniforge3:latest resource_class: large steps: - run: diff --git a/doc/sphinx/source/quickstart/installation.rst b/doc/sphinx/source/quickstart/installation.rst index 891494348b..9f66c1f670 100644 --- a/doc/sphinx/source/quickstart/installation.rst +++ b/doc/sphinx/source/quickstart/installation.rst @@ -99,7 +99,7 @@ later by running: source /etc/profile.d/conda.sh where ```` is the installation location of mamba (e.g. -``/home/$USER/mambaforge`` if you chose the default installation path). +``/home/$USER/miniforge3`` if you chose the default installation path). If you use another shell than Bash, have a look at the available configurations in the ``/etc/profile.d`` directory. @@ -111,7 +111,7 @@ You can check that mamba installed correctly by running which mamba this should show the path to your mamba executable, e.g. -``~/mambaforge/bin/mamba``. +``~/miniforge3/bin/mamba``. It is recommended to update both mamba and conda after installing: @@ -489,7 +489,7 @@ To check that the installation was successful, run this should show the directory of the source code that you just downloaded. If the command above shows a directory inside your conda environment instead, -e.g. ``~/mambaforge/envs/esmvaltool/lib/python3.11/site-packages/esmvalcore``, +e.g. ``~/miniforge3/envs/esmvaltool/lib/python3.11/site-packages/esmvalcore``, you may need to manually remove that directory and run ``pip install --editable '.[develop]'`` again. diff --git a/doc/sphinx/source/utils.rst b/doc/sphinx/source/utils.rst index 71de0e01f6..49c3df7aef 100644 --- a/doc/sphinx/source/utils.rst +++ b/doc/sphinx/source/utils.rst @@ -177,7 +177,7 @@ The following parameters have to be set in the script in order to make it run: * ``submit``, *bool*: Whether or not to automatically submit the job after creating the launch script. Default value is ``False``. * ``account``, *str*: Name of the DKRZ account in which the job will be billed. * ``outputs``, *str*: Name of the directory in which the job outputs (.out and .err files) are going to be saved. The outputs will be saved in `/home/user/`. -* ``conda_path``, *str*: Full path to the `mambaforge/etc/profile.d/conda.sh` executable. +* ``conda_path``, *str*: Full path to the `miniforge3/etc/profile.d/conda.sh` executable. Optionally, the following parameters can be edited: diff --git a/docker/Dockerfile b/docker/Dockerfile index 9ee3ddf0f8..9670028c7b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # To build this container, go to ESMValTool root folder and execute: # docker build -t esmvaltool:latest . -f docker/Dockerfile -FROM condaforge/mambaforge +FROM condaforge/miniforge3 WORKDIR /src/ESMValTool COPY environment.yml . diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index 65f1a34ea5..b7204abaa7 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,6 +1,6 @@ # To build this container, go to ESMValTool root folder and execute: # docker build -t esmvaltool:development . -f docker/Dockerfile.dev -FROM condaforge/mambaforge +FROM condaforge/miniforge3 WORKDIR /src/ESMValTool RUN apt update && DEBIAN_FRONTEND=noninteractive apt install -y curl git ssh && apt clean diff --git a/docker/Dockerfile.exp b/docker/Dockerfile.exp index a522995fc4..062a64b8ab 100644 --- a/docker/Dockerfile.exp +++ b/docker/Dockerfile.exp @@ -1,6 +1,6 @@ # To build this container, go to ESMValTool root folder and execute: # docker build -t esmvaltool:experimental . -f docker/Dockerfile.exp -FROM condaforge/mambaforge +FROM condaforge/miniforge3 RUN apt update && apt install -y git && apt clean WORKDIR /src/ESMValTool diff --git a/esmvaltool/utils/batch-jobs/generate.py b/esmvaltool/utils/batch-jobs/generate.py index afba37906f..d1ceeffaa0 100644 --- a/esmvaltool/utils/batch-jobs/generate.py +++ b/esmvaltool/utils/batch-jobs/generate.py @@ -46,9 +46,9 @@ memory = '64G' # Default walltime time = '04:00:00' -# Full path to the mambaforge/etc/profile.d/conda.sh executable +# Full path to the miniforge3/etc/profile.d/conda.sh executable # Set the path to conda -conda_path = 'PATH_TO/mambaforge/etc/profile.d/conda.sh' +conda_path = 'PATH_TO/miniforge3/etc/profile.d/conda.sh' # Full path to config_file # If none, ~/.esmvaltool/config-user.yml is used config_file = ''