Merge branch 'main' into update_epsiode_04

Author: LisaBock

Gemfile

@@ -7,4 +7,10 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 # Synchronize with https://pages.github.com/versions
 ruby '>=2.5.3'
 
-gem 'github-pages', group: :jekyll_plugins
+#  github-pages conflics with jekyll+liquid, but the site
+#  builds well locally; github-pages gem is semi-deprecated
+#  and should not be used as gem anymore, instead use via Actions
+#  gem 'github-pages', group: :jekyll_plugins
+gem 'jekyll', '~> 4.3'
+gem 'csv'
+gem 'bigdecimal'

Makefile

@@ -7,7 +7,7 @@ export SHELL = /bin/bash
 # Settings
 MAKEFILES=Makefile $(wildcard *.mk)
 JEKYLL_VERSION=3.8.5
-JEKYLL=bundle install --path .vendor/bundle && bundle update && bundle exec jekyll
+JEKYLL=bundle install && bundle update --all && bundle exec jekyll
 PARSER=bin/markdown_ast.rb
 DST=_site
 

_episodes/00-introduction.md

@@ -2,7 +2,7 @@
 title: "Introduction"
 teaching: 5
 exercises: 10
-compatibility: ESMValTool v2.13.0
+compatibility: ESMValTool v2.14.0
 
 questions:
 - What is ESMValTool?

_episodes/01-quickstart.md

@@ -2,7 +2,7 @@
 title: "Quickstart guide"
 teaching: 2
 exercises: 8
-compatibility: ESMValTool v2.13.0
+compatibility: ESMValTool v2.14.0
 
 questions:
 
@@ -27,7 +27,7 @@ keypoints:
   see the [Installation][lesson-installation]
   episode for more details and use `esmvaltool --help` to check the ESMValTool 
   environment"
-- "Use `esmvaltool config get_config_user` to create the ESMValTool user 
+- "Use `esmvaltool config copy defaults/config-user.yml` to create the ESMValTool user 
   configuration file"
 - "Use `esmvaltool run <recipe>.yml` to run a recipe"
 ---
@@ -71,7 +71,7 @@ keypoints:
 >   default to `~/.config/esmvaltool/config-user.yml`):
 >
 >     ~~~
->     esmvaltool config get_config_user
+>     esmvaltool config copy defaults/config-user.yml
 >     ~~~
 >     {: .language-bash}
 > 

_episodes/02-installation.md

@@ -2,7 +2,7 @@
 title: "Installation"
 teaching: 10
 exercises: 10
-compatibility: ESMValTool v2.13.0
+compatibility: ESMValTool v2.14.0
 questions:
 - "What are the prerequisites for installing ESMValTool?"
 - "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
 To install mamba on ``Linux`` or ``MacOSX``, follow the  instructions below:
 
 1.  Please download the installation file for the latest Mamba version 
-[here](https://github.com/conda-forge/miniforge#mambaforge).
+for Linux 
+[here](https://github.com/conda-forge/miniforge/releases/latest/download/
+Miniforge3-Linux-x86_64.sh)
+or for MacOSX 
+[here](https://github.com/conda-forge/miniforge/releases/latest/download/
+Miniforge3-MacOSX-x86_64.sh).
 
 2.  Next, run the installer from the place where you downloaded it:
 
@@ -88,10 +93,10 @@ To install mamba on ``Linux`` or ``MacOSX``, follow the  instructions below:
 
 4.  You will need to restart your terminal for the changes to have effect.
 
-5.  We recommend updating mamba before the esmvaltool installation. To do so, run:
+5.  We recommend updating mamba and conda before the esmvaltool installation. To do so, run:
 
     ```bash
-    mamba update --name base mamba
+    mamba update --name base mamba conda
     ```
 
 6.  Verify you have a working mamba installation by: 
@@ -100,7 +105,7 @@ To install mamba on ``Linux`` or ``MacOSX``, follow the  instructions below:
     which mamba
     ```
 
-    This should show the path to your mamba executable, e.g. `~/mambaforge/bin/mamba`.
+    This should show the path to your mamba executable, e.g. `~/miniforge3/bin/mamba`.
 
 For more information about installing mamba,
 see [the mamba installation documentation](https://docs.esmvaltool.org/en
@@ -183,13 +188,13 @@ to display the command line help.
 > > {: .bash}
 > > The version of ESMValTool installed should be displayed on the screen as:
 > > ~~~
-> > ESMValCore: 2.13.0
-> > ESMValTool: 2.13.0
+> > ESMValCore: 2.14.0
+> > ESMValTool: 2.14.0
 > > ~~~
 > > {: .output}
 > Note that on HPC servers such as JASMIN, sometimes a more recent development 
 > version may be displayed for ESMValTool, for e.g. 
-> `ESMValTool: 2.14.0.dev17+g3505bfed2`
+> `ESMValTool: 2.15.0.dev4+g74d7837f0`
 > {: .solution}
 {: .challenge}