From 1aacdb20e40ab8bdf1f1cc8aa804bea3b95dcb10 Mon Sep 17 00:00:00 2001 From: June Choe Date: Tue, 18 Jul 2023 23:02:04 +0900 Subject: [PATCH] use string for package version comparison --- NEWS.md | 3 +++ R/aaa.R | 2 +- cran-comments.md | 6 +----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/NEWS.md b/NEWS.md index 5f62f78..11165ee 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ # jlmerclusterperm (development version) +Fixes for CRAN: + +- Use string for package version comparison # jlmerclusterperm 1.0.2 diff --git a/R/aaa.R b/R/aaa.R index 6ab8a8d..fab722f 100644 --- a/R/aaa.R +++ b/R/aaa.R @@ -14,7 +14,7 @@ # Helpers julia_version_compatible <- function() { julia_version <- gsub("^.*(\\d+\\.\\d+\\.\\d+).*$", "\\1", system2("julia", "--version", stdout = TRUE)) - as.package_version(julia_version) >= 1.8 + as.package_version(julia_version) >= "1.8" } is_setup <- function() isTRUE(.jlmerclusterperm$is_setup) diff --git a/cran-comments.md b/cran-comments.md index ccb7f93..233a3d0 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,8 +1,4 @@ -* Small patch to fix a failure to parse the Julia version when it's in rc or alpha. - -* The exclusion of Manifest.toml is now specified in .Rbuildignore - only Project.toml is bundled as intended. Users will generate their own Manifest.toml as part of activating the project. This resolves the errors from a prior submission where the accidental inclusion of my own Manifest.toml triggered a stricter criteria for resolving the versions of (downstream) dependencies. - -Apologies for frequency of resubmission. +* Small patch to use string for package version comparison ## R CMD check results