diff --git a/.buildlibrary b/.buildlibrary index 37dddec..c7a4771 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '2401680' +ValidationKey: '2434883' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' @@ -6,3 +6,5 @@ AcceptedWarnings: AcceptedNotes: ~ allowLinterWarnings: no enforceVersionUpdate: no +AutocreateCITATION: yes +skipCoverage: no diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 23545e6..54aa78b 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -44,6 +44,13 @@ jobs: [ -f requirements.txt ] && python -m pip install --upgrade pip wheel || true [ -f requirements.txt ] && pip install -r requirements.txt || true + - name: Run pre-commit checks + shell: bash + run: | + python -m pip install pre-commit + python -m pip freeze --local + pre-commit run --show-diff-on-failure --color=always --all-files + - name: Verify validation key shell: Rscript {0} run: lucode2:::validkey(stopIfInvalid = TRUE) @@ -63,6 +70,6 @@ jobs: shell: Rscript {0} run: | nonDummyTests <- setdiff(list.files("./tests/testthat/"), c("test-dummy.R", "_snaps")) - if(length(nonDummyTests) > 0) covr::codecov(quiet = FALSE) + if(length(nonDummyTests) > 0 && !lucode2:::loadBuildLibraryConfig()[["skipCoverage"]]) covr::codecov(quiet = FALSE) env: NOT_CRAN: "true" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7ccf77e..3edf90a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ exclude: '^tests/testthat/_snaps/.*$' repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0 + rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0 hooks: - id: check-case-conflict - id: check-json @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3 + rev: 3b70240796cdccbe1474b0176560281aaded97e6 # frozen: v0.4.3.9003 hooks: - id: parsable-R - id: deps-in-desc @@ -25,4 +25,4 @@ repos: - id: readme-rmd-rendered - id: use-tidy-description ci: - autoupdate_schedule: quarterly + autoupdate_schedule: weekly diff --git a/CITATION.cff b/CITATION.cff index d2b7d7a..4ed3792 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mrlandcore: One-line description of this awesome package' -version: 1.2.0 -date-released: '2024-10-18' +version: 1.2.1 +date-released: '2025-02-04' abstract: One-paragraph description of this awesome package. authors: - family-names: Beier diff --git a/DESCRIPTION b/DESCRIPTION index 32940be..0fdeaa3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrlandcore Title: One-line description of this awesome package -Version: 1.2.0 -Date: 2024-10-18 +Version: 1.2.1 +Date: 2025-02-04 Authors@R: c( person("Felicitas", "Beier", , "beier@pik-potsdam.de", role = c("aut", "cre")), person("Kristine", "Karstens", role = "aut"), diff --git a/R/correctLUH2v2.R b/R/correctLUH2v2.R index d4180a5..8ab8770 100644 --- a/R/correctLUH2v2.R +++ b/R/correctLUH2v2.R @@ -51,8 +51,8 @@ correctLUH2v2 <- function(x, subtype) { x["JPN", buggedYears, "range"][x["JPN", buggedYears, "range"] < 0] <- 0 } else { - stop("it seems the Japan bug in LUH2v2 has been removed. - Please remove the bugfix in correct LUH2v2 before proceeding!") + message("it seems the Japan bug in LUH2v2 has been removed. ", + "Please remove the bugfix in correct LUH2v2 before proceeding!") } } diff --git a/README.md b/README.md index c03500c..6b1c411 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # One-line description of this awesome package -R package **mrlandcore**, version **1.2.0** +R package **mrlandcore**, version **1.2.1** -[![CRAN status](https://www.r-pkg.org/badges/version/mrlandcore)](https://cran.r-project.org/package=mrlandcore) [![R build status](https://github.com/pik-piam/mrlandcore/workflows/check/badge.svg)](https://github.com/pik-piam/mrlandcore/actions) [![codecov](https://codecov.io/gh/pik-piam/mrlandcore/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrlandcore) [![r-universe](https://pik-piam.r-universe.dev/badges/mrlandcore)](https://pik-piam.r-universe.dev/builds) +[![CRAN status](https://www.r-pkg.org/badges/version/mrlandcore)](https://cran.r-project.org/package=mrlandcore) [![R build status](https://github.com/pik-piam/mrlandcore/workflows/check/badge.svg)](https://github.com/pik-piam/mrlandcore/actions) [![codecov](https://codecov.io/gh/pik-piam/mrlandcore/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrlandcore) [![r-universe](https://pik-piam.r-universe.dev/badges/mrlandcore)](https://pik-piam.r-universe.dev/builds) ## Purpose and Functionality @@ -38,16 +38,17 @@ In case of questions / problems please contact Felicitas Beier . +Beier F, Karstens K, Alves M, Philipp Dietrich J, Leon Bodirsky B, Hoetten D, Humpenoeder F, Heinke J, v. Jeetze P, Mishra A, Beier F, Wirth S, Chen D, Kreidenweis U (2025). "mrlandcore: One-line description of this awesome package." Version: 1.2.1, . A BibTeX entry for LaTeX users is ```latex -@Manual{, +@Misc{, title = {mrlandcore: One-line description of this awesome package}, author = {Felicitas Beier and Kristine Karstens and Marcos Alves and Jan {Philipp Dietrich} and Benjamin {Leon Bodirsky} and David Hoetten and Florian Humpenoeder and Jens Heinke and Patrick {v. Jeetze} and Abhijeet Mishra and Felcitas Beier and Stephen Wirth and David Chen and Ulrich Kreidenweis}, - year = {2024}, - note = {R package version 1.2.0}, + date = {2025-02-04}, + year = {2025}, url = {https://github.com/pik-piam/mrlandcore}, + note = {Version: 1.2.1}, } ```