-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #106 from flohump/master
added option to write units in netCDF files based on comment argument
- Loading branch information
Showing
8 changed files
with
103 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
ValidationKey: '11447946' | ||
ValidationKey: '11489376' | ||
AcceptedWarnings: | ||
- 'Warning: package ''.*'' was built under R version' | ||
- 'Warning: namespace ''.*'' is not available and has been replaced' | ||
AcceptedNotes: unable to verify current time | ||
AutocreateReadme: yes | ||
UseGithubActions: yes | ||
allowLinterWarnings: yes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
# Run CI for R using https://eddelbuettel.github.io/r-ci/ | ||
|
||
name: lucode2-check | ||
|
||
on: | ||
push: | ||
branches: [main, master] | ||
pull_request: | ||
branches: [main, master] | ||
|
||
env: | ||
USE_BSPM: "true" | ||
_R_CHECK_FORCE_SUGGESTS_: "false" | ||
NO_BINARY_INSTALL_R_PACKAGES: 'c("madrat", "magclass", "citation", "gms", "goxygen")' | ||
|
||
jobs: | ||
lucode2-check: | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- uses: actions/checkout@v2 | ||
|
||
- name: Bootstrap | ||
run: | | ||
curl -OLs https://eddelbuettel.github.io/r-ci/run.sh | ||
chmod 0755 run.sh | ||
./run.sh bootstrap | ||
- name: Enable r-universe repo, modify bspm integration | ||
run: | | ||
# install packages from https://pik-piam.r-universe.dev and CRAN | ||
echo ' | ||
options(repos = c(universe = "https://pik-piam.r-universe.dev", | ||
CRAN = "https://cloud.r-project.org")) | ||
' >> .Rprofile | ||
cat .Rprofile | ||
# modify bspm integration to never install binary builds of PIK CRAN packages | ||
sudo sed -i '/bspm::enable()/d' /etc/R/Rprofile.site | ||
# need double % because of printf, %s is replaced with "$NO_BINARY_INSTALL_R_PACKAGES" (see "env:" above) | ||
printf ' | ||
local({ | ||
expr <- quote({ | ||
if (!is.null(repos)) { | ||
noBinaryInstallRPackages <- %s | ||
pkgs <- c(bspm::install_sys(pkgs[!pkgs %%in%% noBinaryInstallRPackages]), | ||
pkgs[pkgs %%in%% noBinaryInstallRPackages]) | ||
} | ||
}) | ||
trace(utils::install.packages, expr, print = FALSE) | ||
}) | ||
' "$NO_BINARY_INSTALL_R_PACKAGES" | sudo tee --append /etc/R/Rprofile.site >/dev/null | ||
cat /etc/R/Rprofile.site | ||
- uses: r-lib/actions/setup-pandoc@v1 | ||
|
||
- name: Install dependencies | ||
run: | | ||
./run.sh install_aptget libhdf5-dev | ||
./run.sh install_all | ||
./run.sh install_r lucode2 covr | ||
- name: Remove bspm integration # to get rid of error when running install.packages | ||
run: | | ||
sudo sed -i '/ trace(utils::install.packages, expr, print = FALSE)/d' /etc/R/Rprofile.site | ||
cat /etc/R/Rprofile.site | ||
- name: Verify validation key | ||
shell: Rscript {0} | ||
run: lucode2:::validkey(stopIfInvalid = TRUE) | ||
|
||
- name: Checks | ||
shell: Rscript {0} | ||
run: | | ||
options(crayon.enabled = TRUE) | ||
lucode2::check(runLinter = FALSE) | ||
- name: Test coverage | ||
shell: Rscript {0} | ||
run: covr::codecov(quiet = FALSE) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
Package: magclass | ||
Type: Package | ||
Title: Data Class and Tools for Handling Spatial-Temporal Data | ||
Version: 6.0.6 | ||
Date: 2021-09-21 | ||
Version: 6.0.8 | ||
Date: 2021-09-27 | ||
Authors@R: c(person("Jan Philipp", "Dietrich", email = "[email protected]", role = c("aut","cre")), | ||
person("Benjamin Leon", "Bodirsky", email = "[email protected]", role = "aut"), | ||
person("Markus", "Bonsch", role = "aut"), | ||
|
@@ -51,5 +51,5 @@ BugReports: https://github.com/pik-piam/magclass/issues | |
License: LGPL-3 | file LICENSE | ||
LazyData: true | ||
Encoding: UTF-8 | ||
RoxygenNote: 7.1.1 | ||
RoxygenNote: 7.1.2 | ||
VignetteBuilder: knitr |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.