From 5564cefcdbd09fd51f450121ec2b7e13a7ac7dc0 Mon Sep 17 00:00:00 2001 From: Andrea Gilardi Date: Fri, 29 Mar 2024 21:52:21 +0100 Subject: [PATCH 1/3] the package version must be specified as a character instead of numeric see #265 --- R/spatstat.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/spatstat.R b/R/spatstat.R index 306e57fb..bee92db2 100644 --- a/R/spatstat.R +++ b/R/spatstat.R @@ -15,7 +15,7 @@ check_spatstat = function(pkg) { ) } else { spst_ver = try(packageVersion("spatstat"), silent = TRUE) - if (!inherits(spst_ver, "try-error") && spst_ver < 2.0-0) { + if (!inherits(spst_ver, "try-error") && spst_ver < "2.0-0") { stop( "You have an old version of spatstat which is incompatible with ", pkg, From 329f6ba6967f192c9fcb0fc8c2d199a3d546e4fe Mon Sep 17 00:00:00 2001 From: Andrea Gilardi Date: Fri, 29 Mar 2024 21:52:45 +0100 Subject: [PATCH 2/3] update docs --- man/as.linnet.Rd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/as.linnet.Rd b/man/as.linnet.Rd index ac814f8b..a4c61239 100644 --- a/man/as.linnet.Rd +++ b/man/as.linnet.Rd @@ -5,7 +5,7 @@ \alias{as.linnet.sfnetwork} \title{Convert a sfnetwork into a linnet} \usage{ -\method{as.linnet}{sfnetwork}(X, ...) +as.linnet.sfnetwork(X, ...) } \arguments{ \item{X}{An object of class \code{\link{sfnetwork}} with a projected CRS.} From a8d86cb513a677a4e34bc89af2de7be4c91ab72c Mon Sep 17 00:00:00 2001 From: Andrea Gilardi Date: Fri, 29 Mar 2024 21:55:58 +0100 Subject: [PATCH 3/3] simplify GHA --- .github/workflows/R-CMD-check.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a1161d30..99989ebc 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - R: [ 'release', 'devel' ] + R: [ 'release' ] env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} R_KEEP_PKG_SOURCE: yes @@ -23,11 +23,10 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: r-version: ${{ matrix.R }} - use-public-rspm: false + use-public-rspm: true - uses: r-lib/actions/setup-r-dependencies@v2 with: - cache-version: 2 extra-packages: rcmdcheck - uses: r-lib/actions/check-r-package@v2