From 9e1c192e6953df3fb36e4f6dfcbb948ed7d3fb79 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 19 Dec 2024 12:07:20 +0100 Subject: [PATCH 1/3] fix permission problems --- R/compareScenarios.R | 3 +++ piamplotcomparison.Rproj | 1 + 2 files changed, 4 insertions(+) diff --git a/R/compareScenarios.R b/R/compareScenarios.R index 054c19b..6094f5e 100644 --- a/R/compareScenarios.R +++ b/R/compareScenarios.R @@ -168,6 +168,8 @@ compareScenarios <- function( outputDir, recursive = TRUE) } + Sys.chmod(outputDir) + rmarkdown::render( templateInOutputDir, intermediates_dir = outputDir, @@ -221,6 +223,7 @@ compareScenarios <- function( invert = TRUE, value = TRUE) file.copy(rmdDirFiles, pathDir) + Sys.chmod(pathDir) ymlthis::use_rmarkdown( newYaml, diff --git a/piamplotcomparison.Rproj b/piamplotcomparison.Rproj index 497f8bf..3518505 100644 --- a/piamplotcomparison.Rproj +++ b/piamplotcomparison.Rproj @@ -1,4 +1,5 @@ Version: 1.0 +ProjectId: 65a496ed-e9da-4226-99b7-1a02287a4f93 RestoreWorkspace: Default SaveWorkspace: Default From 7de1dce63c0254f24e2fff132ff10a802e2e083c Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 19 Dec 2024 12:15:20 +0100 Subject: [PATCH 2/3] fix permission problems --- R/compareScenarios.R | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/R/compareScenarios.R b/R/compareScenarios.R index 6094f5e..9497a88 100644 --- a/R/compareScenarios.R +++ b/R/compareScenarios.R @@ -168,7 +168,8 @@ compareScenarios <- function( outputDir, recursive = TRUE) } - Sys.chmod(outputDir) + # avoid potential problems with write permissions on the copied files + Sys.chmod(list.files(outputDir, full.names = TRUE)) rmarkdown::render( templateInOutputDir, @@ -223,7 +224,9 @@ compareScenarios <- function( invert = TRUE, value = TRUE) file.copy(rmdDirFiles, pathDir) - Sys.chmod(pathDir) + + # avoid potential problems with write permissions on the copied files + Sys.chmod(list.files(pathDir, full.names = TRUE)) ymlthis::use_rmarkdown( newYaml, From 1e45adde465267902a5046a055f4ebc2bf492294 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 19 Dec 2024 13:27:51 +0100 Subject: [PATCH 3/3] increment version --- .buildlibrary | 3 ++- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 9 +++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 8f42817..67dc85e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '200730' +ValidationKey: '220836' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' @@ -7,3 +7,4 @@ AcceptedNotes: All declared Imports should be used. allowLinterWarnings: yes enforceVersionUpdate: no skipCoverage: no +AutocreateCITATION: yes diff --git a/CITATION.cff b/CITATION.cff index 0f1435d..7f848b8 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: 'piamPlotComparison: Create comparison plots for your model results' -version: 0.1.0 -date-released: '2024-12-16' +version: 0.1.1 +date-released: '2024-12-19' abstract: A frameworks to create comparison plots for your model results. authors: - family-names: Benke diff --git a/DESCRIPTION b/DESCRIPTION index a5e0ce5..52b4d76 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: piamPlotComparison Title: Create comparison plots for your model results -Version: 0.1.0 -Date: 2024-12-16 +Version: 0.1.1 +Date: 2024-12-19 Authors@R: c( person("Falk", "Benke", , "benke@pik-potsdam.de", role = c("aut", "cre")), person("Christof", "Schoetz", role = "aut") diff --git a/README.md b/README.md index 74a981d..b9f6f4d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Create comparison plots for your model results -R package **piamPlotComparison**, version **0.1.0** +R package **piamPlotComparison**, version **0.1.1** [![CRAN status](https://www.r-pkg.org/badges/version/piamPlotComparison)](https://cran.r-project.org/package=piamPlotComparison) [![R build status](https://github.com/pik-piam/piamPlotComparison/workflows/check/badge.svg)](https://github.com/pik-piam/piamPlotComparison/actions) [![codecov](https://codecov.io/gh/pik-piam/piamPlotComparison/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/piamPlotComparison) [![r-universe](https://pik-piam.r-universe.dev/badges/piamPlotComparison)](https://pik-piam.r-universe.dev/builds) @@ -46,16 +46,17 @@ In case of questions / problems please contact Falk Benke To cite package **piamPlotComparison** in publications use: -Benke F, Schoetz C (2024). _piamPlotComparison: Create comparison plots for your model results_. R package version 0.1.0, . +Benke F, Schoetz C (2024). "piamPlotComparison: Create comparison plots for your model results." Version: 0.1.1, . A BibTeX entry for LaTeX users is ```latex -@Manual{, +@Misc{, title = {piamPlotComparison: Create comparison plots for your model results}, author = {Falk Benke and Christof Schoetz}, + date = {2024-12-19}, year = {2024}, - note = {R package version 0.1.0}, url = {https://github.com/pik-piam/piamPlotComparison}, + note = {Version: 0.1.1}, } ```