From 79d1bfa01b77e14b9deceb72b290446ebabb8bfb Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 14:49:33 -0400 Subject: [PATCH 1/8] add news.md --- NEWS.md | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 NEWS.md diff --git a/NEWS.md b/NEWS.md new file mode 100644 index 0000000..4efefc6 --- /dev/null +++ b/NEWS.md @@ -0,0 +1,11 @@ +# SELECTRshed 0.1.1 + +## Minor changes + +* add tests +* add additional checks for SpatVectors, valid `wbt_results` and terra object. +* add CI infrastructure + +# SELECTRshed 0.1.0 + +* Initial release. From 516fbc1b2824fc751a34b3e3273944c13479f4bb Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 14:55:14 -0400 Subject: [PATCH 2/8] add gha r-build --- .Rbuildignore | 1 + .github/.gitignore | 1 + .github/workflows/R-CMD-check.yaml | 51 ++++++++++++++++++++++++++++++ README.Rmd | 1 + README.md | 1 + 5 files changed, 55 insertions(+) create mode 100644 .github/.gitignore create mode 100644 .github/workflows/R-CMD-check.yaml diff --git a/.Rbuildignore b/.Rbuildignore index 9f58a17..5f3d199 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -2,3 +2,4 @@ ^\.Rproj\.user$ ^LICENSE\.md$ ^README\.Rmd$ +^\.github$ diff --git a/.github/.gitignore b/.github/.gitignore new file mode 100644 index 0000000..2d19fc7 --- /dev/null +++ b/.github/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml new file mode 100644 index 0000000..562fe0f --- /dev/null +++ b/.github/workflows/R-CMD-check.yaml @@ -0,0 +1,51 @@ +# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples +# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help +on: + push: + branches: [main, master] + pull_request: + +name: R-CMD-check.yaml + +permissions: read-all + +jobs: + R-CMD-check: + runs-on: ${{ matrix.config.os }} + + name: ${{ matrix.config.os }} (${{ matrix.config.r }}) + + strategy: + fail-fast: false + matrix: + config: + - {os: macos-latest, r: 'release'} + - {os: windows-latest, r: 'release'} + - {os: ubuntu-latest, r: 'devel', http-user-agent: 'release'} + - {os: ubuntu-latest, r: 'release'} + - {os: ubuntu-latest, r: 'oldrel-1'} + + env: + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + R_KEEP_PKG_SOURCE: yes + + steps: + - uses: actions/checkout@v4 + + - uses: r-lib/actions/setup-pandoc@v2 + + - uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ matrix.config.r }} + http-user-agent: ${{ matrix.config.http-user-agent }} + use-public-rspm: true + + - uses: r-lib/actions/setup-r-dependencies@v2 + with: + extra-packages: any::rcmdcheck + needs: check + + - uses: r-lib/actions/check-r-package@v2 + with: + upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/README.Rmd b/README.Rmd index 300a5ed..1b6adc7 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,6 +18,7 @@ knitr::opts_chunk$set( [![](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental) +[![R-CMD-check](https://github.com/TxWRI/SELECTRshed/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/TxWRI/SELECTRshed/actions/workflows/R-CMD-check.yaml) Delineate watersheds using whitebox tools and terra objects. diff --git a/README.md b/README.md index d795f72..213532c 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental) +[![R-CMD-check](https://github.com/TxWRI/SELECTRshed/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/TxWRI/SELECTRshed/actions/workflows/R-CMD-check.yaml) Delineate watersheds using whitebox tools and terra objects. These From d549ab59f0a7cd901e838054c24e6d1c720e0aca Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 14:55:44 -0400 Subject: [PATCH 3/8] version number --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 887f8d8..1e4b0b3 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: SELECTRshed Type: Package Title: Catchment and Subcatchment Delineation -Version: 0.1.0 +Version: 0.1.1 Authors@R: person(given = "Michael", family = "Schramm", email = "mpschramm@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0003-1876-6592")) From f245b099ec1b1f99ba3f18af70e94e5ee5cdc64c Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 15:02:55 -0400 Subject: [PATCH 4/8] additional repo --- .github/workflows/R-CMD-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 562fe0f..5feebfa 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -39,6 +39,7 @@ jobs: r-version: ${{ matrix.config.r }} http-user-agent: ${{ matrix.config.http-user-agent }} use-public-rspm: true + extra-repositories: 'https://txwri.r-universe.dev' - uses: r-lib/actions/setup-r-dependencies@v2 with: From f1a89d65ac4991463088261cd8208d26bf65c4c3 Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 15:16:09 -0400 Subject: [PATCH 5/8] install whitebox --- .github/workflows/R-CMD-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 5feebfa..1443c6a 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -45,6 +45,7 @@ jobs: with: extra-packages: any::rcmdcheck needs: check + - run: Rscript -e 'whitebox::install_whitebox()' - uses: r-lib/actions/check-r-package@v2 with: From 7fda638c11b2ab1e5fa6e3e2fe5d06f93ee918a9 Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 15:22:46 -0400 Subject: [PATCH 6/8] point to correct package --- tests/testthat/test-create_streams_.R | 2 +- tests/testthat/test-create_subbasins.R | 2 +- tests/testthat/test-create_watershed.R | 2 +- tests/testthat/test-snap_pour_point.R | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/testthat/test-create_streams_.R b/tests/testthat/test-create_streams_.R index 24c82e1..7847a12 100644 --- a/tests/testthat/test-create_streams_.R +++ b/tests/testthat/test-create_streams_.R @@ -1,6 +1,6 @@ test_that("create_streams_ returns expected types", { testthat::skip_on_cran() - dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") + dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) D8fa <- create_d8_fa(D8pointer) diff --git a/tests/testthat/test-create_subbasins.R b/tests/testthat/test-create_subbasins.R index f0401ee..7917a2f 100644 --- a/tests/testthat/test-create_subbasins.R +++ b/tests/testthat/test-create_subbasins.R @@ -1,6 +1,6 @@ test_that("create_subbasins_ returns expected types", { testthat::skip_on_cran() - dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") + dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) D8fa <- create_d8_fa(D8pointer) diff --git a/tests/testthat/test-create_watershed.R b/tests/testthat/test-create_watershed.R index 4a0e493..9429f45 100644 --- a/tests/testthat/test-create_watershed.R +++ b/tests/testthat/test-create_watershed.R @@ -1,6 +1,6 @@ test_that("create_watershed_ returns expected types", { testthat::skip_on_cran() - dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") + dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) gpkg <- system.file("extdata", "thompsoncreek.gpkg", package = "SELECTRdata") pourpoint <- terra::vect(gpkg, layer = "pourpoint", crs = terra::crs(dem)) diff --git a/tests/testthat/test-snap_pour_point.R b/tests/testthat/test-snap_pour_point.R index 065fec8..cbcc109 100644 --- a/tests/testthat/test-snap_pour_point.R +++ b/tests/testthat/test-snap_pour_point.R @@ -1,6 +1,6 @@ test_that("snap_pour_point_ returns expected types", { testthat::skip_on_cran() - dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") + dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) gpkg <- system.file("extdata", "thompsoncreek.gpkg", package = "SELECTRdata") pourpoint <- terra::vect(gpkg, layer = "pourpoint", crs = terra::crs(dem)) From a880390dd331c2ef241c0f357d52c7f895fb4e93 Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 15:41:08 -0400 Subject: [PATCH 7/8] fix examples --- R/create_D8_.R | 6 +++--- R/create_breach_depression_.R | 2 +- R/create_fill_depressions.R | 2 +- R/create_single_pit_fill.R | 2 +- R/create_streams.R | 2 +- R/create_streams_vector.R | 2 +- R/create_subbasins.R | 2 +- R/create_watershed.R | 2 +- man/create_D8_fa.Rd | 2 +- man/create_breach_depression.Rd | 2 +- man/create_d8_pointer.Rd | 2 +- man/create_fill_depressions.Rd | 2 +- man/create_single_pit_fill.Rd | 2 +- man/create_streams.Rd | 2 +- man/create_streams_vector.Rd | 2 +- man/create_subbasins.Rd | 2 +- man/create_watershed.Rd | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/R/create_D8_.R b/R/create_D8_.R index a95438c..b110d2c 100644 --- a/R/create_D8_.R +++ b/R/create_D8_.R @@ -14,7 +14,7 @@ #' @export #' @examplesIf whitebox::check_whitebox_binary() #' # example code -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' create_d8_pointer(dem) #' @@ -27,7 +27,7 @@ create_d8_pointer <- function(dem, ## need to check whitebox tools is installed whitebox_bin() - + ## check args # dem should be terra obj, does not have to be file backed object since {whitebox} takes care of that when using `wbt()` # output should be valid file path @@ -77,7 +77,7 @@ create_d8_pointer <- function(dem, #' @export #' @examplesIf whitebox::check_whitebox_binary() #' # example code -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' D8pointer <- create_d8_pointer(dem) #' create_d8_fa(D8pointer) diff --git a/R/create_breach_depression_.R b/R/create_breach_depression_.R index 260a067..3908ad1 100644 --- a/R/create_breach_depression_.R +++ b/R/create_breach_depression_.R @@ -81,7 +81,7 @@ create_breach_depression_lc <- function(dem, #' @return A SpatRaster object. #' @export #' @examplesIf whitebox::check_whitebox_binary() -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' create_breach_depression(dem) #' diff --git a/R/create_fill_depressions.R b/R/create_fill_depressions.R index 9896a7d..13f9f34 100644 --- a/R/create_fill_depressions.R +++ b/R/create_fill_depressions.R @@ -17,7 +17,7 @@ #' #' @examplesIf whitebox::check_whitebox_binary() #' # example code -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' create_fill_depressions(dem) #' diff --git a/R/create_single_pit_fill.R b/R/create_single_pit_fill.R index 1984c09..bb951aa 100644 --- a/R/create_single_pit_fill.R +++ b/R/create_single_pit_fill.R @@ -10,7 +10,7 @@ #' @return A SpatRaster object #' @export #' @examplesIf whitebox::check_whitebox_binary() -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' create_single_pit_fill(dem) create_single_pit_fill <- function(dem, diff --git a/R/create_streams.R b/R/create_streams.R index 621fda7..0c27dc8 100644 --- a/R/create_streams.R +++ b/R/create_streams.R @@ -16,7 +16,7 @@ #' @export #' @examplesIf whitebox::check_whitebox_binary() #' # example code -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' D8pointer <- create_d8_pointer(dem) #' D8fa <- create_d8_fa(D8pointer) diff --git a/R/create_streams_vector.R b/R/create_streams_vector.R index aca0c45..a7b44e3 100644 --- a/R/create_streams_vector.R +++ b/R/create_streams_vector.R @@ -17,7 +17,7 @@ #' @export #' @examplesIf whitebox::check_whitebox_binary() #' # example code -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' D8pointer <- create_d8_pointer(dem) #' D8fa <- create_d8_fa(D8pointer) diff --git a/R/create_subbasins.R b/R/create_subbasins.R index fe17319..fe95b4d 100644 --- a/R/create_subbasins.R +++ b/R/create_subbasins.R @@ -12,7 +12,7 @@ #' @return SpatRaster #' @export #' @examplesIf whitebox::check_whitebox_binary() -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' D8pointer <- create_d8_pointer(dem) #' D8fa <- create_d8_fa(D8pointer) diff --git a/R/create_watershed.R b/R/create_watershed.R index 2000372..9e4c0e5 100644 --- a/R/create_watershed.R +++ b/R/create_watershed.R @@ -13,7 +13,7 @@ #' @return A SpatRaster or wbt_result object. #' @export #' @examplesIf whitebox::check_whitebox_binary() -#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +#' dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") #' dem <- terra::rast(dem) #' gpkg <- system.file("extdata", "thompsoncreek.gpkg", package = "SELECTRdata") #' pourpoint <- terra::vect(gpkg, layer = "pourpoint", crs = terra::crs(dem)) diff --git a/man/create_D8_fa.Rd b/man/create_D8_fa.Rd index 2cd7660..71aa427 100644 --- a/man/create_D8_fa.Rd +++ b/man/create_D8_fa.Rd @@ -46,7 +46,7 @@ terra SpatRaster objects or a file path to common raster files. \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # example code -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) create_d8_fa(D8pointer) diff --git a/man/create_breach_depression.Rd b/man/create_breach_depression.Rd index 9092d21..05645dc 100644 --- a/man/create_breach_depression.Rd +++ b/man/create_breach_depression.Rd @@ -40,7 +40,7 @@ Breaches all of the depressions in a DEM using Lindsay's (2016) algorithm. This } \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) create_breach_depression(dem) \dontshow{\}) # examplesIf} diff --git a/man/create_d8_pointer.Rd b/man/create_d8_pointer.Rd index 0d2659b..fe21d30 100644 --- a/man/create_d8_pointer.Rd +++ b/man/create_d8_pointer.Rd @@ -34,7 +34,7 @@ objects or a file path to common raster files. \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # example code -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) create_d8_pointer(dem) \dontshow{\}) # examplesIf} diff --git a/man/create_fill_depressions.Rd b/man/create_fill_depressions.Rd index 8542e02..4d8ee80 100644 --- a/man/create_fill_depressions.Rd +++ b/man/create_fill_depressions.Rd @@ -40,7 +40,7 @@ objects or a file path to common raster files. \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # example code -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) create_fill_depressions(dem) \dontshow{\}) # examplesIf} diff --git a/man/create_single_pit_fill.Rd b/man/create_single_pit_fill.Rd index 44c45a1..0a41f5f 100644 --- a/man/create_single_pit_fill.Rd +++ b/man/create_single_pit_fill.Rd @@ -28,7 +28,7 @@ Wrapper for whitebox \code{FillSingleCellPits}. Raises pit cells to the elevatio } \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) create_single_pit_fill(dem) \dontshow{\}) # examplesIf} diff --git a/man/create_streams.Rd b/man/create_streams.Rd index 3cb96f5..dfdae84 100644 --- a/man/create_streams.Rd +++ b/man/create_streams.Rd @@ -38,7 +38,7 @@ objects or a file path to common raster files. \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # example code -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) D8fa <- create_d8_fa(D8pointer) diff --git a/man/create_streams_vector.Rd b/man/create_streams_vector.Rd index 68a2111..c11ad63 100644 --- a/man/create_streams_vector.Rd +++ b/man/create_streams_vector.Rd @@ -41,7 +41,7 @@ terra SpatRaster objects or a file path to common raster files. \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # example code -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) D8fa <- create_d8_fa(D8pointer) diff --git a/man/create_subbasins.Rd b/man/create_subbasins.Rd index e70301c..81d30ee 100644 --- a/man/create_subbasins.Rd +++ b/man/create_subbasins.Rd @@ -37,7 +37,7 @@ Identifies the catchments, or sub-basin, draining to each link in a stream netwo } \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) D8fa <- create_d8_fa(D8pointer) diff --git a/man/create_watershed.Rd b/man/create_watershed.Rd index 88d4817..514d6cd 100644 --- a/man/create_watershed.Rd +++ b/man/create_watershed.Rd @@ -37,7 +37,7 @@ Identifies the watershed, or drainage basin, draining to a set of target cells. } \examples{ \dontshow{if (whitebox::check_whitebox_binary()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} -dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTR") +dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) gpkg <- system.file("extdata", "thompsoncreek.gpkg", package = "SELECTRdata") pourpoint <- terra::vect(gpkg, layer = "pourpoint", crs = terra::crs(dem)) From 1f3eb27800c28191a63038ba57bab89661472a7a Mon Sep 17 00:00:00 2001 From: mps9506 Date: Wed, 29 Oct 2025 16:10:33 -0400 Subject: [PATCH 8/8] skip tests in whitebox binary is not installed --- tests/testthat/test-create_D8.R | 1 + tests/testthat/test-create_breach_depression_.R | 2 ++ tests/testthat/test-create_fill_depressions.R | 1 + tests/testthat/test-create_single_pit_fill.R | 1 + tests/testthat/test-create_streams_.R | 1 + tests/testthat/test-create_subbasins.R | 1 + tests/testthat/test-create_watershed.R | 1 + tests/testthat/test-snap_pour_point.R | 1 + 8 files changed, 9 insertions(+) diff --git a/tests/testthat/test-create_D8.R b/tests/testthat/test-create_D8.R index be6816e..03c2bf1 100644 --- a/tests/testthat/test-create_D8.R +++ b/tests/testthat/test-create_D8.R @@ -1,5 +1,6 @@ test_that("create_d8_* returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) breached <- create_breach_depression_lc(dem, dist = 10) diff --git a/tests/testthat/test-create_breach_depression_.R b/tests/testthat/test-create_breach_depression_.R index 5d02312..5c5d041 100644 --- a/tests/testthat/test-create_breach_depression_.R +++ b/tests/testthat/test-create_breach_depression_.R @@ -1,5 +1,6 @@ test_that("create_breach_depression_lc returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) breached <- create_breach_depression_lc(dem, dist = 10) @@ -15,6 +16,7 @@ test_that("create_breach_depression_lc returns expected types", { test_that("create_breach_depression returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) breached <- create_breach_depression(dem) diff --git a/tests/testthat/test-create_fill_depressions.R b/tests/testthat/test-create_fill_depressions.R index b3b236d..444104c 100644 --- a/tests/testthat/test-create_fill_depressions.R +++ b/tests/testthat/test-create_fill_depressions.R @@ -1,5 +1,6 @@ test_that("create_fill_depressions returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) x <- create_fill_depressions(dem) diff --git a/tests/testthat/test-create_single_pit_fill.R b/tests/testthat/test-create_single_pit_fill.R index 7d968eb..ba36a7f 100644 --- a/tests/testthat/test-create_single_pit_fill.R +++ b/tests/testthat/test-create_single_pit_fill.R @@ -1,5 +1,6 @@ test_that("create_single_pit_fill returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) x <- create_single_pit_fill(dem) diff --git a/tests/testthat/test-create_streams_.R b/tests/testthat/test-create_streams_.R index 7847a12..6d0f5f3 100644 --- a/tests/testthat/test-create_streams_.R +++ b/tests/testthat/test-create_streams_.R @@ -1,5 +1,6 @@ test_that("create_streams_ returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) diff --git a/tests/testthat/test-create_subbasins.R b/tests/testthat/test-create_subbasins.R index 7917a2f..6a80150 100644 --- a/tests/testthat/test-create_subbasins.R +++ b/tests/testthat/test-create_subbasins.R @@ -1,5 +1,6 @@ test_that("create_subbasins_ returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) D8pointer <- create_d8_pointer(dem) diff --git a/tests/testthat/test-create_watershed.R b/tests/testthat/test-create_watershed.R index 9429f45..605567d 100644 --- a/tests/testthat/test-create_watershed.R +++ b/tests/testthat/test-create_watershed.R @@ -1,5 +1,6 @@ test_that("create_watershed_ returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) gpkg <- system.file("extdata", "thompsoncreek.gpkg", package = "SELECTRdata") diff --git a/tests/testthat/test-snap_pour_point.R b/tests/testthat/test-snap_pour_point.R index cbcc109..eb80a38 100644 --- a/tests/testthat/test-snap_pour_point.R +++ b/tests/testthat/test-snap_pour_point.R @@ -1,5 +1,6 @@ test_that("snap_pour_point_ returns expected types", { testthat::skip_on_cran() + testthat::skip_if_not(whitebox::check_whitebox_binary(), "whitebox binary not installed") dem <- system.file("extdata", "thompsoncreek.tif", package = "SELECTRdata") dem <- terra::rast(dem) gpkg <- system.file("extdata", "thompsoncreek.gpkg", package = "SELECTRdata")