Merge pull request #198 from tscheypidi/master

bugfix in fingerprint function
pik-piam · Jan 11, 2024 · 3b46321 · 3b46321
2 parents e74aca1 + 97b74ef
commit 3b46321
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '7484100'
+ValidationKey: '7518273'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

diff --git 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: 'madrat: May All Data be Reproducible and Transparent (MADRaT) *'
-version: 3.8.0
-date-released: '2023-12-04'
+version: 3.8.1
+date-released: '2024-01-11'
 abstract: Provides a framework which should improve reproducibility and transparency
   in data processing. It provides functionality such as automatic meta data creation
   and management, rudimentary quality management, data caching, work-flow management

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: madrat
 Title: May All Data be Reproducible and Transparent (MADRaT) *
-Version: 3.8.0
-Date: 2023-12-04
+Version: 3.8.1
+Date: 2024-01-11
 Authors@R: c(
     person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = "aut"),

diff --git a/R/fingerprint.R b/R/fingerprint.R
@@ -141,6 +141,7 @@ fingerprintFiles <- function(paths) {
       }
     }
     hashCacheFile <- getHashCacheName(path)
+    orgFiles <- files
 
     if (!is.null(hashCacheFile) && file.exists(hashCacheFile)) {
       tryResult <- try({
@@ -176,10 +177,7 @@ fingerprintFiles <- function(paths) {
           dir.create(dirname(hashCacheFile), recursive = TRUE)
         }
         tryCatch({
-          # write to tempfile to avoid corrupt cache files in parallel running preprocessings
-          tempfileName <- paste0(hashCacheFile, Sys.getenv("SLURM_JOB_ID", unset = ""))
-          saveRDS(files, file = tempfileName, compress = getConfig("cachecompression"))
-          file.rename(tempfileName, hashCacheFile)
+          saveRDS(orgFiles, file = hashCacheFile, compress = getConfig("cachecompression"))
           Sys.chmod(hashCacheFile, mode = "0666", use_umask = FALSE)
         }, error = function(error) {
           warning("Saving hashCacheFile failed: ", error)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # May All Data be Reproducible and Transparent (MADRaT) *
 
-R package **madrat**, version **3.8.0**
+R package **madrat**, version **3.8.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/madrat)](https://cran.r-project.org/package=madrat) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1115490.svg)](https://doi.org/10.5281/zenodo.1115490) [![R build status](https://github.com/pik-piam/madrat/workflows/check/badge.svg)](https://github.com/pik-piam/madrat/actions) [![codecov](https://codecov.io/gh/pik-piam/madrat/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/madrat) [![r-universe](https://pik-piam.r-universe.dev/badges/madrat)](https://pik-piam.r-universe.dev/builds)
 
@@ -55,16 +55,16 @@ In case of questions / problems please contact Jan Philipp Dietrich <dietrich@pi
 
 To cite package **madrat** in publications use:
 
-Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2023). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi:10.5281/zenodo.1115490 <https://doi.org/10.5281/zenodo.1115490>, R package version 3.8.0, <https://github.com/pik-piam/madrat>.
+Dietrich J, Baumstark L, Wirth S, Giannousakis A, Rodrigues R, Bodirsky B, Leip D, Kreidenweis U, Klein D, Sauer P (2024). _madrat: May All Data be Reproducible and Transparent (MADRaT)_. doi: 10.5281/zenodo.1115490 (URL: https://doi.org/10.5281/zenodo.1115490), R package version 3.8.1, <URL: https://github.com/pik-piam/madrat>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
 @Manual{,
   title = {madrat: May All Data be Reproducible and Transparent (MADRaT)},
   author = {Jan Philipp Dietrich and Lavinia Baumstark and Stephen Wirth and Anastasis Giannousakis and Renato Rodrigues and Benjamin Leon Bodirsky and Debbora Leip and Ulrich Kreidenweis and David Klein and Pascal Sauer},
-  year = {2023},
-  note = {R package version 3.8.0},
+  year = {2024},
+  note = {R package version 3.8.1},
   doi = {10.5281/zenodo.1115490},
   url = {https://github.com/pik-piam/madrat},
 }