Skip to content

Commit

Permalink
Merge branch 'development' into modsForLargeArchives
Browse files Browse the repository at this point in the history
  • Loading branch information
Eliot McIntire committed Mar 29, 2024
2 parents 601a9bc + b5efe85 commit e50ed75
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 29 deletions.
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ SystemRequirements: 'unrar' (Linux/macOS) or '7-Zip' (Windows) to work with '.ra
URL:
https://reproducible.predictiveecology.org,
https://github.com/PredictiveEcology/reproducible
Date: 2024-01-05
Version: 2.0.10.9018
Date: 2024-03-28
Version: 2.0.11
Authors@R:
c(person(given = "Eliot J B",
family = "McIntire",
Expand Down Expand Up @@ -66,7 +66,6 @@ Suggests:
covr,
crayon,
DBI,
fastdigest,
future,
geodata,
glue,
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@



# reproducible 2.0.11

## Remove dependency
* fastdigest was removed from CRAN and so is removed from here.

# reproducible 2.0.10

## Bug fixes
Expand Down
3 changes: 1 addition & 2 deletions R/cache.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ utils::globalVariables(c(
#' Currently, only file-backed `Raster*` or `terra*` objects are digested
#' (e.g., not `ff` objects, or any other R object where the data
#' are on disk instead of in RAM);
#' \item Uses [digest::digest()] (formerly fastdigest, which does
#' not translate between operating systems).
#' \item Uses [digest::digest()]
#' This is used for file-backed objects as well.
#' \item Cache will save arguments passed by user in a hidden environment. Any
#' nested Cache functions will use arguments in this order 1) actual arguments
Expand Down
6 changes: 0 additions & 6 deletions R/objectSize.R
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
#' os1 <- utils::object.size(as.environment("package:reproducible"))
#' (os1) # very small -- just the environment container
#'
#' # slow next bit
#' \donttest{
#' os2 <- objSize(as.environment("package:reproducible"))
#' sum(unlist(os2)) # possibly 100+ MB, with all functions, objects
#' # and imported functions
#' }
#' @details
#' For functions, a user can include the enclosing environment as described
#' <https://www.r-bloggers.com/2015/03/using-closures-as-objects-in-r/> and
Expand Down
2 changes: 1 addition & 1 deletion R/options.R
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#' \item{`cacheSpeed`}{
#' Default `"slow"`. One of `"slow"` or `"fast"` (1 or 2).
#' `"slow"` uses `digest::digest` internally, which is transferable across operating
#' systems, but much slower than `fastdigest::fastdigest`.
#' systems, but much slower than `digest::digest(algo = "spooky)`.
#' So, if all caching is happening on a single machine, `"fast"` would be a good setting.
#' }
#' \item{`conn`}{
Expand Down
6 changes: 1 addition & 5 deletions R/robustDigest.R
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,6 @@ basenames3 <- function(object, nParentDirs) {
} else if (cacheSpeed == "slow") {
cacheSpeed <- 1L
}
if (!.requireNamespace("fastdigest", stopOnFALSE = FALSE)) {
cacheSpeed <- 1L
}

out <- if (cacheSpeed == 1) {
if (length(x) == 1) {
if (is.atomic(x))
Expand All @@ -512,7 +508,7 @@ basenames3 <- function(object, nParentDirs) {
}
digest::digest(x, algo = algo)
} else if (cacheSpeed == 2) {
fastdigest::fastdigest(x)
digest::digest(x, algo = "spooky")
} else {
stop("options('reproducible.cacheSpeed') must be 1, 2, 'slow' or 'fast'")
}
Expand Down
3 changes: 1 addition & 2 deletions man/Cache.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/checkPath.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/normPath.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions man/objSize.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/reproducibleOptions.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/robustDigest.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit e50ed75

Please sign in to comment.