Merge pull request #28 from yjunechoe/1.1.1

1.1.1
yjunechoe · Feb 8, 2024 · 54e25b1 · 54e25b1
2 parents f2c8284 + 8f14f9d
commit 54e25b1
Show file tree

Hide file tree

Showing 47 changed files with 130 additions and 113 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 1.1.0
-Date: 2023-10-04 21:17:30 UTC
-SHA: d49bad606380799b1b2c4f73a87ccc6585d05e5c
+Version: 1.1.1
+Date: 2024-02-07 17:45:58 UTC
+SHA: c69f5c5308ae5c0c96d955d46d309231299f9c2f
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: jlmerclusterperm
 Title: Cluster-Based Permutation Analysis for Densely Sampled Time Data
-Version: 1.1.0
+Version: 1.1.1
 Authors@R: 
     person("June", "Choe", , "jchoe001@gmail.com", role = c("aut", "cre", "cph"),
            comment = c(ORCID = "0000-0002-0701-921X"))

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,12 @@
-# jlmerclusterperm (development version)
+# jlmerclusterperm 1.1.1
+
+# jlmerclusterperm 1.1.1
+
+- More informative warnings when constructing a spec object
+
+- Fixed minor bugs when interfacing with Julia
+
+- Fixed bug with reporting convergence warnings when only one is encountered
 
 # jlmerclusterperm 1.1.0
 

diff --git a/R/aaa.R b/R/aaa.R
@@ -16,7 +16,7 @@ julia_cli <- function(x) {
   utils::tail(system2("julia", x, stdout = TRUE), 1L)
 }
 parse_julia_version <- function(version) {
-  gsub("^julia version .*(\\d+\\.\\d+\\.\\d+).*$", "\\1", version)
+  gsub("^julia.version .*(\\d+\\.\\d+\\.\\d+).*$", "\\1", version)
 }
 julia_version <- function() {
   parse_julia_version(julia_cli("--version"))

diff --git a/README.md b/README.md
@@ -273,7 +273,7 @@ following as you see fit.
 To cite jlmerclusterperm:
 
 - Choe, J. (2023). jlmerclusterperm: Cluster-Based Permutation Analysis
-  for Densely Sampled Time Data. R package version 1.1.0.
+  for Densely Sampled Time Data. R package version 1.1.1.
   <https://cran.r-project.org/package=jlmerclusterperm>.
 
 To cite the cluster-based permutation test:

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,7 +1,3 @@
-Fixes for CRAN:
-
-* Specified importing from backports which was missing previously
-
 ## R CMD check results
 
 0 errors | 0 warnings | 0 notes
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/articles/Garrison-et-al-2020.html b/docs/articles/Garrison-et-al-2020.html
diff --git a/docs/articles/Geller-et-al-2020.html b/docs/articles/Geller-et-al-2020.html
diff --git a/docs/articles/asynchronous-cpa.html b/docs/articles/asynchronous-cpa.html
diff --git a/docs/articles/deCarvalho-et-al-2021.html b/docs/articles/deCarvalho-et-al-2021.html