Skip to content

Commit

Permalink
only pass character vectors to numeric_version
Browse files Browse the repository at this point in the history
  • Loading branch information
stevenpawley committed Jun 21, 2023
1 parent 4c3bb33 commit 5cb615f
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Version: 0.4.0
Date: 2023-05-26 03:18:37 UTC
SHA: 7b78753a95ce66c8f553ad075ecf068eba0b0eba
Version: 0.4.1
Date: 2023-06-21 02:54:46 UTC
SHA: 4c3bb336ad6400ba369b95bf9fe19db0594b193d
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: Rsagacmd
Type: Package
Title: Linking R with the Open-Source 'SAGA-GIS' Software
Version: 0.4.0
Version: 0.4.1
Date: 2023-05-25
Authors@R: c(
person("Steven", "Pawley",
Expand Down
6 changes: 5 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# Rsagacmd 0.3
# Rsagacmd 0.41

Minor fix to only pass character vectors to 'numeric_version'

# Rsagacmd 0.4

Changes:

Expand Down
6 changes: 6 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## R CMD check results

0 errors | 0 warnings | 0 note

* Minor update to address CRAN issue related to passing a numeric instead of a
character vector to numeric_version()
4 changes: 2 additions & 2 deletions tests/testthat/test-data-formats.R
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ test_that("test raster formats (SAGA)", {
test_that("test raster formats (SAGA Compressed)", {
testthat::skip_on_cran()
testthat::skip_if(is.null(search_saga()))
testthat::skip_if(saga_version(search_saga()) < numeric_version(5.0))
testthat::skip_if(saga_version(search_saga()) < numeric_version("5.0"))

saga <- saga_gis(raster_format = "SAGA Compressed")
dem <- saga$grid_calculus$random_terrain()
Expand All @@ -58,7 +58,7 @@ test_that("test raster formats (SAGA Compressed)", {
test_that("test vector formats (GeoPackage)", {
testthat::skip_on_cran()
testthat::skip_if(is.null(search_saga()))
testthat::skip_if(saga_version(search_saga()) < numeric_version(5.0))
testthat::skip_if(saga_version(search_saga()) < numeric_version("5.0"))

saga <- saga_gis(vector_format = "GeoPackage")

Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-utils.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
testthat::test_that("tile geoprocessor function", {
testthat::skip_on_cran()
testthat::skip_if(is.null(search_saga()))
testthat::skip_if(saga_version(search_saga()) < numeric_version(7.0))
testthat::skip_if(saga_version(search_saga()) < numeric_version("7.0"))

saga <- saga_gis()

Expand Down

0 comments on commit 5cb615f

Please sign in to comment.