Remove {scales} from Suggests (#288)

* no {scales}

* test-SDA_spatialQuery: Handle empty result and try-error equivalently

* setup-r-dependencies: R expression needs to be quoted for `upgrade` param

.github/workflows/R-CMD-check.yml

@@ -63,7 +63,7 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: any::rcmdcheck, any::remotes, local::.
-          upgrade: TRUE
+          upgrade: 'TRUE'
           needs: check
 
       - name: Install soilDBdata off GitHub

DESCRIPTION

@@ -13,7 +13,7 @@ License: GPL (>= 3)
 LazyLoad: yes
 Depends: R (>= 3.5.0)
 Imports: grDevices, graphics, stats, utils, methods, aqp, data.table, DBI, curl
-Suggests: jsonlite, xml2, httr, rvest, odbc, RSQLite, sf, wk, terra, raster, scales, knitr, rmarkdown, testthat
+Suggests: jsonlite, xml2, httr, rvest, odbc, RSQLite, sf, wk, terra, raster, knitr, rmarkdown, testthat
 Repository: CRAN
 URL: https://ncss-tech.github.io/soilDB/, https://ncss-tech.github.io/AQP/
 BugReports: https://github.com/ncss-tech/soilDB/issues

R/fetchOSD.R

@@ -114,7 +114,7 @@
 #' @author D.E. Beaudette, A.G. Brown
 #' @seealso \link{OSDquery}, \link{siblings}
 #' @export
-#' @examplesIf curl::has_internet() && requireNamespace("scales")
+#' @examplesIf curl::has_internet()
 #' @examples
 #' \donttest{
 #'   library(aqp)

R/soilDB-package.R

@@ -32,10 +32,10 @@ NULL
 #' @aliases loafercreek gopheridge mineralKing
 #' @docType data
 #' @keywords datasets
+#' @examplesIf require("aqp")
 #' @examples
 #'
 #' \donttest{
-#' if (require("aqp") && requireNamespace("scales")) {
 #' # load example dataset
 #'   data("gopheridge")
 #'
@@ -83,7 +83,6 @@ NULL
 #'   # add diagnostic horizons
 #'   addDiagnosticBracket(loafercreek[1:10, ], kind='argillic horizon', col='red', offset=-0.4)
 #' }
-#' }
 #'
 NULL
 

tests/testthat/test-SDA_query.R

@@ -166,7 +166,8 @@ test_that("SDA_spatialQuery() spatial query of MUKEY with multiple features", {
 
   res <- SDA_spatialQuery(x)
 
-  skip_if(inherits(res, 'try-error'))
+  # if the result set is empty rather than an error, SDA_query() result can be NULL
+  skip_if(is.null(res) || inherits(res, 'try-error'))
 
   expect_equal(nrow(res), 2)