From 58d6162d7d4e493f6e7a2d53d9e4ab4f511befb3 Mon Sep 17 00:00:00 2001 From: orichters Date: Mon, 19 Feb 2024 16:43:57 +0100 Subject: [PATCH] sort AMT by name, not time --- .buildlibrary | 3 ++- .pre-commit-config.yaml | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/modeltests.R | 2 +- R/promptAndRun.R | 2 +- README.md | 6 +++--- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 135e308..f8c7dd9 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '3358860' +ValidationKey: '3381012' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' @@ -6,3 +6,4 @@ AcceptedWarnings: AcceptedNotes: unable to verify current time AutocreateReadme: yes allowLinterWarnings: yes +enforceVersionUpdate: no diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2f13466..243f46a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: v0.3.2.9025 + rev: v0.4.0 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 3f55f4d..0f64e5e 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.17.0 -date-released: '2024-02-05' +version: 0.17.1 +date-released: '2024-02-19' abstract: A collection of tools to analyze model runs. authors: - family-names: Giannousakis diff --git a/DESCRIPTION b/DESCRIPTION index 5337041..b95a7aa 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: modelstats Type: Package Title: Run Analysis Tools -Version: 0.17.0 -Date: 2024-02-05 +Version: 0.17.1 +Date: 2024-02-19 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 a84b2d0..127e76b 100644 --- a/R/modeltests.R +++ b/R/modeltests.R @@ -392,7 +392,7 @@ evaluateRuns <- function(model, mydir, gitPath, compScen, email, mattermostToken # compose message, each vector element will appear in a new line in the final message. message <- NULL if (model == "REMIND") { - rs2 <- utils::capture.output(loopRuns(runsStarted, user = NULL, colors = FALSE)) + rs2 <- utils::capture.output(loopRuns(runsStarted, user = NULL, colors = FALSE, sortbytime = FALSE)) message <- paste0("Please find below the status of the REMIND automated model tests (AMT) of ", today, ":") message <- c(message, "```", gitInfo, "```") message <- c(message, "```", rs2, "```") diff --git a/R/promptAndRun.R b/R/promptAndRun.R index b00e70d..4066a9b 100644 --- a/R/promptAndRun.R +++ b/R/promptAndRun.R @@ -23,7 +23,7 @@ promptAndRun <- function(mydir = ".", user = NULL, daysback = 3) { cat("Results from", amtPath, "\n") amtPattern <- if (is.null(user) || user == "") readRDS("/p/projects/remind/modeltests/remind/runcode.rds") else user amtDirs <- dir(path = amtPath, pattern = amtPattern, full.names = TRUE) - loopRuns(amtDirs, user = NULL, colors = colors) + loopRuns(amtDirs, user = NULL, colors = colors, sortbytime = FALSE) return(invisible()) } if (is.null(user) || user == "") user <- Sys.info()[["user"]] diff --git a/README.md b/README.md index 59a81c6..c895149 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Run Analysis Tools -R package **modelstats**, version **0.17.0** +R package **modelstats**, version **0.17.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.17.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.17.0}, + note = {R package version 0.17.1}, url = {https://github.com/pik-piam/modelstats}, } ```