Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Retire mambaforge - addendum to 3774 #3778

Merged
merged 4 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -233,7 +233,7 @@ jobs:
build_documentation:
# Test building documentation
docker:
- image: condaforge/mambaforge:latest
- image: condaforge/miniforge3:latest
resource_class: medium
steps:
- checkout
Expand All @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions doc/sphinx/source/quickstart/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ later by running:
source <prefix>/etc/profile.d/conda.sh

where ``<prefix>`` 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 ``<prefix>/etc/profile.d`` directory.
Expand All @@ -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:

Expand Down Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/source/utils.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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/<outputs>`.
* ``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:

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 .
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.exp
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions esmvaltool/utils/batch-jobs/generate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ''
Expand Down