From b179a8fa1df6ee80defc6102585d41b6667df5b7 Mon Sep 17 00:00:00 2001 From: June Choe Date: Tue, 11 Jul 2023 11:53:19 +0900 Subject: [PATCH] allow rc and alpha builds of Julia --- NEWS.md | 6 ++++++ R/aaa.R | 2 +- docs/news/index.html | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index ae65f98..cefb08f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# jlmerclusterperm 1.0.2 + +### Bug fixes + +- `jlmerclusterperm_setup()` now works for rc and alpha builds of Julia + # jlmerclusterperm 1.0.1 `jlmerclusterperm_setup()` now exits early if Julia version requirement (>=1.8) is not met. diff --git a/R/aaa.R b/R/aaa.R index 8e3b42b..6ab8a8d 100644 --- a/R/aaa.R +++ b/R/aaa.R @@ -13,7 +13,7 @@ # Helpers julia_version_compatible <- function() { - julia_version <- gsub("julia version ", "", system2("julia", "--version", stdout = TRUE)) + julia_version <- gsub("^.*(\\d+\\.\\d+\\.\\d+).*$", "\\1", system2("julia", "--version", stdout = TRUE)) as.package_version(julia_version) >= 1.8 } is_setup <- function() isTRUE(.jlmerclusterperm$is_setup) diff --git a/docs/news/index.html b/docs/news/index.html index c776632..8879278 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -62,6 +62,14 @@ Source: NEWS.md +
+

jlmerclusterperm 1.0.2

+
+

Bug fixes

+
+

jlmerclusterperm 1.0.1

CRAN release: 2023-07-02

jlmerclusterperm_setup() now exits early if Julia version requirement (>=1.8) is not met.