Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
eliotmcintire committed Aug 7, 2023
2 parents 6eabf4c + 8372415 commit 4d540f4
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 22 deletions.
4 changes: 2 additions & 2 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: 2023-07-30
Version: 2.0.6
Date: 2023-08-07
Version: 2.0.7
Authors@R:
c(person(given = "Eliot J B",
family = "McIntire",
Expand Down
3 changes: 2 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# reproducible 2.0.6
# reproducible 2.0.7

## Enhancements
* Address change in `round` with `R > 4.3.1`; now a primitive, that does method dispatch. Failure was identified with unit tests, by Luke Tierney who was making the change in `base::round`.

## Bug fixes
* several identified and fixed (PRs by Ceres Barros, notably, PRs #341, #342, #343). These fix missing argument in a `.unwrap` call, and missing check in `preProcess`, when `targetFilePath` was `NULL`.
* minor documentation updates

# reproducible 2.0.5

Expand Down
3 changes: 2 additions & 1 deletion R/download.R
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,6 @@ dlGoogle <- function(url, archive = NULL, targetFile = NULL,
#' Download file from generic source url
#'
#' @param url The url (link) to the file.
#' @param needChecksums Logical indicating whether to generate checksums. ## TODO: add overwrite arg to the function?
#'
#' @author Eliot McIntire and Alex Chubaty
#' @keywords internal
Expand Down Expand Up @@ -441,6 +440,8 @@ dlGeneric <- function(url, destinationPath, verbose = getOption("reproducible.ve
}

#' @inheritParams prepInputs
#' @param needChecksums Logical indicating whether to generate checksums. ## TODO: add overwrite arg to the function?
#'
downloadRemote <- function(url, archive, targetFile, checkSums, dlFun = NULL,
fileToDownload, messSkipDownload,
destinationPath, overwrite, needChecksums, .tempPath,
Expand Down
8 changes: 1 addition & 7 deletions R/postProcess.R
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ postProcess.default <- function(x, ...) {
#' @return A GIS file (e.g., RasterLayer, SpatRaster etc.) that has been
#' appropriately cropped.
#' @rdname deprecated
#' @name deprecated
cropInputs <- function(x, studyArea, rasterToMatch, verbose = getOption("reproducible.verbose", 1), ...) {
UseMethod("cropInputs")
}
Expand Down Expand Up @@ -224,11 +225,6 @@ fixErrors.default <- function(x, objectName, attemptErrorFixes = TRUE,
#' resolution and projection of `x`.
#' See details in [postProcessTo()].
#'
#' @param cores An `integer*` or `'AUTO'`. This will be used if `gdalwarp` is
#' triggered. `'AUTO'*` will calculate 90% of the total
#' number of cores in the system, while an integer or rounded
#' float will be passed as the exact number of cores to be used.
#'
#' @return A file of the same type as starting, but with projection (and possibly
#' other characteristics, including resolution, origin, extent if changed).
#'
Expand Down Expand Up @@ -426,8 +422,6 @@ determineFilename <- function(filename2 = NULL, filename1 = NULL,
#'
#' @param overwrite Logical. Should file being written overwrite an existing file if it exists.
#'
#' @param filename2 File name passed to [writeTo()].
#'
#' @param ... Passed into [writeTo()]
#'
#' @inheritParams prepInputs
Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Release information

This is a minor update that accommodates changes in R-devel that are causing a failure in testing of this package. Several other minor enhancements and bugfixes are alson included as outlined in the News.
This is a minor update that accommodates changes in R-devel that are causing a failure in testing of this package. Several other minor enhancements and bugfixes are also included as outlined in the News, including small documentation updates.

See `NEWS.md` for a full list of changes.

Expand Down
10 changes: 2 additions & 8 deletions man/deprecated.Rd

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

2 changes: 0 additions & 2 deletions man/dlGeneric.Rd

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

0 comments on commit 4d540f4

Please sign in to comment.