Skip to content

Commit e4ac5cd

Browse files
committed
Merge remote-tracking branch 'origin/main' into update_epsiode_03
2 parents d0fb0c7 + 5a59f53 commit e4ac5cd

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

_episodes/00-introduction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Introduction"
33
teaching: 5
44
exercises: 10
5-
compatibility: ESMValTool v2.13.0
5+
compatibility: ESMValTool v2.14.0
66

77
questions:
88
- What is ESMValTool?

_episodes/01-quickstart.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Quickstart guide"
33
teaching: 2
44
exercises: 8
5-
compatibility: ESMValTool v2.13.0
5+
compatibility: ESMValTool v2.14.0
66

77
questions:
88

@@ -27,7 +27,7 @@ keypoints:
2727
see the [Installation][lesson-installation]
2828
episode for more details and use `esmvaltool --help` to check the ESMValTool
2929
environment"
30-
- "Use `esmvaltool config get_config_user` to create the ESMValTool user
30+
- "Use `esmvaltool config copy defaults/config-user.yml` to create the ESMValTool user
3131
configuration file"
3232
- "Use `esmvaltool run <recipe>.yml` to run a recipe"
3333
---
@@ -71,7 +71,7 @@ keypoints:
7171
> default to `~/.config/esmvaltool/config-user.yml`):
7272
>
7373
> ~~~
74-
> esmvaltool config get_config_user
74+
> esmvaltool config copy defaults/config-user.yml
7575
> ~~~
7676
> {: .language-bash}
7777
>

_episodes/02-installation.md

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Installation"
33
teaching: 10
44
exercises: 10
5-
compatibility: ESMValTool v2.13.0
5+
compatibility: ESMValTool v2.14.0
66
questions:
77
- "What are the prerequisites for installing ESMValTool?"
88
- "How do I confirm that the installation was successful?"
@@ -67,7 +67,12 @@ ESMValTool is distributed using [Mamba](https://mamba.readthedocs.io/en/latest/i
6767
To install mamba on ``Linux`` or ``MacOSX``, follow the instructions below:
6868

6969
1. Please download the installation file for the latest Mamba version
70-
[here](https://github.com/conda-forge/miniforge#mambaforge).
70+
for Linux
71+
[here](https://github.com/conda-forge/miniforge/releases/latest/download/
72+
Miniforge3-Linux-x86_64.sh)
73+
or for MacOSX
74+
[here](https://github.com/conda-forge/miniforge/releases/latest/download/
75+
Miniforge3-MacOSX-x86_64.sh).
7176

7277
2. Next, run the installer from the place where you downloaded it:
7378

@@ -88,10 +93,10 @@ To install mamba on ``Linux`` or ``MacOSX``, follow the instructions below:
8893

8994
4. You will need to restart your terminal for the changes to have effect.
9095

91-
5. We recommend updating mamba before the esmvaltool installation. To do so, run:
96+
5. We recommend updating mamba and conda before the esmvaltool installation. To do so, run:
9297

9398
```bash
94-
mamba update --name base mamba
99+
mamba update --name base mamba conda
95100
```
96101

97102
6. Verify you have a working mamba installation by:
@@ -100,7 +105,7 @@ To install mamba on ``Linux`` or ``MacOSX``, follow the instructions below:
100105
which mamba
101106
```
102107

103-
This should show the path to your mamba executable, e.g. `~/mambaforge/bin/mamba`.
108+
This should show the path to your mamba executable, e.g. `~/miniforge3/bin/mamba`.
104109

105110
For more information about installing mamba,
106111
see [the mamba installation documentation](https://docs.esmvaltool.org/en
@@ -183,13 +188,13 @@ to display the command line help.
183188
> > {: .bash}
184189
> > The version of ESMValTool installed should be displayed on the screen as:
185190
> > ~~~
186-
> > ESMValCore: 2.13.0
187-
> > ESMValTool: 2.13.0
191+
> > ESMValCore: 2.14.0
192+
> > ESMValTool: 2.14.0
188193
> > ~~~
189194
> > {: .output}
190195
> Note that on HPC servers such as JASMIN, sometimes a more recent development
191196
> version may be displayed for ESMValTool, for e.g.
192-
> `ESMValTool: 2.14.0.dev17+g3505bfed2`
197+
> `ESMValTool: 2.15.0.dev4+g74d7837f0`
193198
> {: .solution}
194199
{: .challenge}
195200

0 commit comments

Comments
 (0)