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.

Sign up for GitHub

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

Move R dependencies to environment.yml and set r-akima version #2725

Closed
wants to merge 4 commits into from
Closed

Move R dependencies to environment.yml and set r-akima version #2725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cef2207
Set right akima version
sloosvel Jul 18, 2022
1de362e
Try to move dependencies
sloosvel Jul 19, 2022
675dcbc
Merge remote-tracking branch 'origin/main' into dev_akima
sloosvel Jul 19, 2022
d1ce11c
Remove whitespace
sloosvel Jul 19, 2022
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
20 changes: 20 additions & 0 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,29 @@ dependencies:
- ncl
- r-base
# R packages needed for development
- r-abind
- r-akima<=0.6-2.3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remember to add the pinning to https://github.com/conda-forge/esmvaltool-suite-feedstock/blob/46332d1f303b96679093b424fb0691ac39083e8b/recipe/meta.yaml#L147 when it comes to the release. Perhaps best to have an issue on the feedstock?

- r-climdex.pcic
- r-ClimProjDiags
- r-docopt
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here, r-dotcall64 seems to be missing. Was this on purpose?

- r-functional
- r-ggplot2
- r-git2r # dependency of lintr
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be removed since conda will take care of dependencies.

- 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
Comment on lines 64 to 65
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- r-yaml
- r-udunits2 # needed by the docker build
- r-udunits2
- r-yaml

26 changes: 0 additions & 26 deletions esmvaltool/install/R/r_requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,4 @@
# url: my_repo_url
# ref: my_branch_commit_or_tag

abind:
akima:
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: