Skip to content

Commit 30219bb

Browse files
committed
require nanonext 1.5.0; run all tests on all platforms
1 parent d3da651 commit 30219bb

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

DESCRIPTION

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: mirai
22
Type: Package
33
Title: Minimalist Async Evaluation Framework for R
4-
Version: 2.0.1.9005
4+
Version: 2.0.1.9006
55
Description: Designed for simplicity, a 'mirai' evaluates an R expression
66
asynchronously in a parallel process, locally or distributed over the
77
network, with the result automatically available upon completion. Modern
@@ -33,7 +33,7 @@ Encoding: UTF-8
3333
Depends:
3434
R (>= 3.6)
3535
Imports:
36-
nanonext (>= 1.4.0)
36+
nanonext (>= 1.5.0)
3737
Enhances:
3838
parallel,
3939
promises
@@ -42,3 +42,4 @@ Suggests:
4242
litedown
4343
VignetteBuilder: litedown
4444
RoxygenNote: 7.3.2
45+
Remotes: shikokuchuo/nanonext

NEWS.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# mirai 2.0.1.9005 (development)
1+
# mirai 2.0.1.9006 (development)
22

33
#### Behavioural Changes
44

@@ -13,6 +13,7 @@
1313
+ Fixes classes of objects in a dataframe being dropped during a multiple map (#196).
1414
+ Better `cli` errors when collecting a 'mirai_map'.
1515
* `status()` call failures when using dispatcher now return the appropriate 'errorValue'.
16+
* Requires nanonext >= 1.5.0.
1617

1718
# mirai 2.0.1
1819

tests/tests.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ connection && {
107107
test_zero(daemons(0L, .compute = "new"))
108108
}
109109
# additional daemons tests
110-
connection && .Platform[["OS.type"]] != "windows" && {
110+
connection && {
111111
Sys.sleep(1L)
112112
test_zero(daemons(url = value <- local_url(), dispatcher = FALSE))
113113
test_identical(status()$daemons, value)
@@ -121,7 +121,7 @@ connection && .Platform[["OS.type"]] != "windows" && {
121121
test_zero(daemons(0L))
122122
}
123123
# mirai_map tests
124-
connection && .Platform[["OS.type"]] != "windows" && {
124+
connection && {
125125
Sys.sleep(1L)
126126
m <- with(daemons(1, dispatcher = "none", .compute = "ml"), {
127127
if (is.null(tryCatch(mirai_map(list(1, "a", 2), sum, .compute = "ml")[.stop], error = function(e) NULL)))
@@ -213,7 +213,7 @@ connection && {
213213
test_null(stopCluster(cl))
214214
}
215215
# advanced daemons and dispatcher tests
216-
connection && .Platform[["OS.type"]] != "windows" && Sys.getenv("NOT_CRAN") == "true" && {
216+
connection && Sys.getenv("NOT_CRAN") == "true" && {
217217
Sys.sleep(0.5)
218218
test_zero(daemons(url = "ws://:0", correctype = 0L, token = TRUE))
219219
test_zero(daemons(0L))
@@ -357,7 +357,7 @@ connection && Sys.getenv("NOT_CRAN") == "true" && {
357357
test_zero(daemons(0))
358358
}
359359
# legacy interface tests
360-
connection && .Platform[["OS.type"]] != "windows" && Sys.getenv("NOT_CRAN") == "true" && {
360+
connection && Sys.getenv("NOT_CRAN") == "true" && {
361361
Sys.sleep(0.5)
362362
option <- 15L
363363
Sys.setenv(R_DEFAULT_PACKAGES = "stats,utils")

0 commit comments

Comments
 (0)