diff --git a/.buildlibrary b/.buildlibrary index 8df987a..0f97ac4 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4402640' +ValidationKey: '4433039' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' @@ -7,3 +7,4 @@ AcceptedNotes: unable to verify current time AutocreateReadme: yes allowLinterWarnings: yes enforceVersionUpdate: no +skipCoverage: no diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 23545e6..d85a316 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -63,6 +63,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..7dcd45b 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 diff --git a/CITATION.cff b/CITATION.cff index 01715ef..4040ec7 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: 'modelstats: Run Analysis Tools' -version: 0.22.0 -date-released: '2024-10-16' +version: 0.22.1 +date-released: '2024-12-02' abstract: A collection of tools to analyze model runs. authors: - family-names: Giannousakis diff --git a/DESCRIPTION b/DESCRIPTION index 59caeec..54b312c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: modelstats Type: Package Title: Run Analysis Tools -Version: 0.22.0 -Date: 2024-10-16 +Version: 0.22.1 +Date: 2024-12-02 Authors@R: c( person("Anastasis", "Giannousakis", email = "giannou@pik-potsdam.de", role = c("aut","cre")), person("Oliver", "Richters", role = "aut") diff --git a/R/modeltests.R b/R/modeltests.R index 8340bd2..de724e3 100644 --- a/R/modeltests.R +++ b/R/modeltests.R @@ -315,9 +315,9 @@ evaluateRuns <- function(model, mydir, compScen, email, mattermostToken, gitdir, ! rownames(gRS) %in% basename(cfg$results_folder)) %>% # but not the current run rownames() if (length(sameRuns) > 0) { + lastRun <- max(sameRuns[sameRuns < basename(cfg$results_folder)]) # compare runtime for converged run only (skip if not_converged) if(grsi[, "Conv"] %in% c("converged", "converged (had INFES)")) { - lastRun <- max(sameRuns[sameRuns < basename(cfg$results_folder)]) currentRunTime <- as.numeric(.readRuntime("."), units = "hours") lastRunTime <- as.numeric(.readRuntime(paste0("../", lastRun)), units = "hours") if (length(currentRunTime) > 0 && length(lastRunTime) > 0 && currentRunTime > (1.25 * lastRunTime)) { diff --git a/README.md b/README.md index 5603412..08d8267 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Run Analysis Tools -R package **modelstats**, version **0.22.0** +R package **modelstats**, version **0.22.1** [![CRAN status](https://www.r-pkg.org/badges/version/modelstats)](https://cran.r-project.org/package=modelstats) [![R build status](https://github.com/pik-piam/modelstats/workflows/check/badge.svg)](https://github.com/pik-piam/modelstats/actions) [![codecov](https://codecov.io/gh/pik-piam/modelstats/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/modelstats) [![r-universe](https://pik-piam.r-universe.dev/badges/modelstats)](https://pik-piam.r-universe.dev/builds) @@ -47,7 +47,7 @@ In case of questions / problems please contact Anastasis Giannousakis . +Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.22.1, . A BibTeX entry for LaTeX users is @@ -56,7 +56,7 @@ A BibTeX entry for LaTeX users is title = {modelstats: Run Analysis Tools}, author = {Anastasis Giannousakis and Oliver Richters}, year = {2024}, - note = {R package version 0.22.0}, + note = {R package version 0.22.1}, url = {https://github.com/pik-piam/modelstats}, } ```