Skip to content

Commit

Permalink
Merge pull request #91 from orichters/rs2
Browse files Browse the repository at this point in the history
sort AMT by name, not time
  • Loading branch information
orichters authored Feb 20, 2024
2 parents 054c77c + 58d6162 commit f1e6a4a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 11 deletions.
3 changes: 2 additions & 1 deletion .buildlibrary
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
ValidationKey: '3358860'
ValidationKey: '3381012'
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
- 'Warning: namespace ''.*'' is not available and has been replaced'
- .*qpdf.* is needed for checks on size reduction of PDFs
AcceptedNotes: unable to verify current time
AutocreateReadme: yes
allowLinterWarnings: yes
enforceVersionUpdate: no
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]", role = c("aut","cre")),
person("Oliver", "Richters", role = "aut")
Expand Down
2 changes: 1 addition & 1 deletion R/modeltests.R
Original file line number Diff line number Diff line change
Expand Up @@ -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, "```")
Expand Down
2 changes: 1 addition & 1 deletion R/promptAndRun.R
Original file line number Diff line number Diff line change
Expand Up @@ -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"]]
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -47,7 +47,7 @@ In case of questions / problems please contact Anastasis Giannousakis <giannou@p

To cite package **modelstats** in publications use:

Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.17.0, <https://github.com/pik-piam/modelstats>.
Giannousakis A, Richters O (2024). _modelstats: Run Analysis Tools_. R package version 0.17.1, <URL: https://github.com/pik-piam/modelstats>.

A BibTeX entry for LaTeX users is

Expand All @@ -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},
}
```

0 comments on commit f1e6a4a

Please sign in to comment.