Merge pull request #266 from luukvdmeer/fixSpatstat

Fix spatstat related code
luukvdmeer · Apr 9, 2024 · 73bfcc7 · 73bfcc7
2 parents fe5177f + a8d86cb
commit 73bfcc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git 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

diff --git 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,

diff --git a/man/as.linnet.Rd b/man/as.linnet.Rd