From cef22071c834e9fd7fd00d4ba7e1c509b0317e85 Mon Sep 17 00:00:00 2001
From: sloosvel <saskia.loosveldt@bsc.es>
Date: Mon, 18 Jul 2022 09:23:01 +0200
Subject: [PATCH 1/3] Set right akima version

---
 environment.yml                         | 2 +-
 esmvaltool/install/R/r_requirements.yml | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index bd170d38eb..fd52095a0e 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,7 +4,7 @@ channels:
   # The release candidate channel should only be activated
   # during the rc phase right before the next release of the
   # ESMValCore.
-  # - conda-forge/label/esmvalcore_rc
+  #  - conda-forge/label/esmvalcore_rc
   - conda-forge
   - nodefaults
 
diff --git a/esmvaltool/install/R/r_requirements.yml b/esmvaltool/install/R/r_requirements.yml
index 14fa06678b..2f5b3500e2 100644
--- a/esmvaltool/install/R/r_requirements.yml
+++ b/esmvaltool/install/R/r_requirements.yml
@@ -27,6 +27,8 @@
 
 abind:
 akima:
+  origin: cran
+  version: 0.6-2.3
 climdex.pcic:
 ClimProjDiags:
 docopt:

From 1de362e8df18db91c926b0d9826047dde12b6282 Mon Sep 17 00:00:00 2001
From: sloosvel <saskia.loosveldt@bsc.es>
Date: Tue, 19 Jul 2022 09:16:49 +0200
Subject: [PATCH 2/3] Try to move dependencies

---
 environment.yml                         | 20 ++++++++++++++++++
 esmvaltool/install/R/r_requirements.yml | 28 -------------------------
 2 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/environment.yml b/environment.yml
index fd52095a0e..4c7efcce94 100644
--- a/environment.yml
+++ b/environment.yml
@@ -37,9 +37,29 @@ dependencies:
   - ncl
   - r-base
   # R packages needed for development
+  - r-abind
+  - r-akima<=0.6-2.3
+  - r-climdex.pcic
+  - r-ClimProjDiags
   - r-docopt
+  - r-functional
+  - r-ggplot2
   - r-git2r  # dependency of lintr
+  - r-gridExtra  
   - r-lintr
+  - r-logging
+  - r-mapproj
+  - r-maps
+  - r-multiApply
+  - r-ncdf4
+  - r-ncdf4.helpers
+  - r-PCICt
+  - r-plyr
+  - r-RColorBrewer
+  - r-Rcpp
+  - r-s2dverification
+  - r-snow
+  - r-SPEI
   - r-styler
   - r-yaml
   - r-udunits2  # needed by the docker build
diff --git a/esmvaltool/install/R/r_requirements.yml b/esmvaltool/install/R/r_requirements.yml
index 2f5b3500e2..90ac92b029 100644
--- a/esmvaltool/install/R/r_requirements.yml
+++ b/esmvaltool/install/R/r_requirements.yml
@@ -25,32 +25,4 @@
 #     url: my_repo_url
 #     ref: my_branch_commit_or_tag
 
-abind:
-akima:
-  origin: cran
-  version: 0.6-2.3
-climdex.pcic:
-ClimProjDiags:
-docopt:
-dotCall64:
-functional:
-ggplot2:
-gridExtra:
-lintr:
-logging:
-mapproj:
-maps:
-multiApply:
-ncdf4:
-ncdf4.helpers:
-PCICt:
-plyr:
-RColorBrewer:
-Rcpp:
-s2dverification:
-snow:
-SPEI:
-styler:
 tools:
-udunits2:
-yaml:

From d1ce11c427d409a5743456612756e0f5530dfe16 Mon Sep 17 00:00:00 2001
From: sloosvel <saskia.loosveldt@bsc.es>
Date: Tue, 19 Jul 2022 09:32:09 +0200
Subject: [PATCH 3/3] Remove whitespace

---
 environment.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 4c7efcce94..d325c282d2 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,7 +4,7 @@ channels:
   # The release candidate channel should only be activated
   # during the rc phase right before the next release of the
   # ESMValCore.
-  #  - conda-forge/label/esmvalcore_rc
+  # - conda-forge/label/esmvalcore_rc
   - conda-forge
   - nodefaults