compatibility: rush 1.0.0 (#151)

* compatibility: rush 1.0.0

* ...

* ...

Author: be-marc

.Rbuildignore

@@ -25,3 +25,4 @@ man-roxygen
 ^CRAN-RELEASE$
 ^CRAN-SUBMISSION$
 ^revdep$
+.claude

.github/workflows/dev-cmd-check.yml

@@ -1,6 +1,5 @@
 # r cmd check workflow without suggests of the mlr3 ecosystem v0.3.1
 # https://github.com/mlr-org/actions
-# modified to use supercharge/redis-github-action@1.7.0
 on:
   workflow_dispatch:
     inputs:
@@ -21,11 +20,22 @@ name: no-suggest-cmd-check
 jobs:
   no-suggest-cmd-check:
     runs-on: ${{ matrix.config.os }}
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
 
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      RUSH_TEST_USE_REDIS: true
 
     strategy:
       fail-fast: false
@@ -42,10 +52,6 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: supercharge/redis-github-action@1.7.0
-        with:
-          redis-version: 7
-
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: |

.github/workflows/no-suggest-cmd-check.yml

@@ -17,6 +17,16 @@ name: pkgdown
 jobs:
   pkgdown:
     runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
 
     concurrency:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}

.github/workflows/pkgdown.yml

@@ -1,6 +1,5 @@
 # r cmd check workflow of the mlr3 ecosystem v0.4.0
 # https://github.com/mlr-org/actions
-# modified to use supercharge/redis-github-action@1.7.0
 on:
   workflow_dispatch:
     inputs:
@@ -21,11 +20,22 @@ name: r-cmd-check
 jobs:
   r-cmd-check:
     runs-on: ${{ matrix.config.os }}
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
 
     name: ${{ matrix.config.os }} (${{ matrix.config.r }})
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      RUSH_TEST_USE_REDIS: true
 
     strategy:
       fail-fast: false
@@ -43,10 +53,6 @@ jobs:
         with:
           r-version: ${{ matrix.config.r }}
 
-      - uses: supercharge/redis-github-action@1.7.0
-        with:
-          redis-version: 7
-
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           extra-packages: any::rcmdcheck

.github/workflows/r-cmd-check.yml

@@ -1,10 +1,11 @@
 linters: linters_with_defaults(
-    # lintr defaults: https://github.com/jimhester/lintr#available-linters
-    # the following setup changes/removes certain linters
-    assignment_linter = NULL, # do not force using <- for assignments
-    object_name_linter = object_name_linter(c("snake_case", "CamelCase")), # only allow snake case and camel case object names
-    cyclocomp_linter = NULL, # do not check function complexity
-    commented_code_linter = NULL, # allow code in comments
-    line_length_linter = NULL
-    )
-
+  # lintr defaults: https://lintr.r-lib.org/reference/default_linters.html
+  # the following setup changes/removes certain linters
+  assignment_linter = NULL, # do not force using <- for assignments
+  object_name_linter = object_name_linter(c("snake_case", "CamelCase")), # only allow snake case and camel case object names
+  cyclocomp_linter = NULL, # do not check function complexity
+  commented_code_linter = NULL, # allow code in comments
+  line_length_linter = line_length_linter(180L),
+  indentation_linter(indent = 2L, hanging_indent_style = "never")
+  )
+exclusions: list("src/*.c", "src/*.h", "src/")

.lintr

@@ -27,7 +27,7 @@ Depends:
     mlr3 (>= 1.0.1),
     R (>= 3.1.0)
 Imports:
-    bbotk (>= 1.8.1),
+    bbotk (>= 1.9.0),
     checkmate (>= 2.0.0),
     cli,
     data.table,
@@ -43,6 +43,8 @@ Suggests:
     mirai,
     mlr3learners,
     mlr3pipelines,
+    processx,
+    redux,
     rpart,
     rush (>= 0.4.1),
     testthat (>= 3.0.0)

DESCRIPTION

@@ -51,18 +51,3 @@ MeasureDummy = R6Class("MeasureDummy", inherit = MeasureRegr,
   )
 mlr3::mlr_measures$add("dummy", MeasureDummy)
 
-flush_redis = function() {
-  config = redux::redis_config()
-  r = redux::hiredis(config)
-  r$FLUSHDB()
-}
-
-expect_rush_reset = function(rush, type = "kill") {
-  rush$reset(type = type)
-  # Sys.sleep(1)
-  # keys = rush$connector$command(c("KEYS", "*"))
-  # if (!test_list(keys, len = 0)) {
-  #   stopf("Found keys in redis after reset: %s", keys)
-  # }
-  mirai::daemons(0)
-}

inst/testthat/helper_misc.R

@@ -0,0 +1,61 @@
+# soon replaced by import from rush package
+skip_if_no_redis = function() {
+  testthat::skip_on_cran()
+
+  if (identical(Sys.getenv("RUSH_TEST_USE_REDIS"), "true") && redux::redis_available()) {
+    return(invisible())
+  }
+
+  testthat::skip("Redis is not available")
+}
+
+redis_configuration = function() {
+  config = redux::redis_config()
+  r = redux::hiredis(config)
+  r$FLUSHDB()
+  config
+}
+
+start_rush = function(n_workers = 2, worker_type = "remote") {
+  config = redis_configuration()
+
+  rush::rush_plan(n_workers = n_workers)
+
+  rush = if (packageVersion("rush") <= "0.4.1") {
+    rush::rush_plan(n_workers = n_workers, worker_type = worker_type)
+    rush::rsh(config = config)
+  } else {
+    rush::rush_plan(n_workers = n_workers, worker_type = worker_type)
+    rush::rsh(config = config)
+  }
+
+  if (worker_type == "remote") {
+    mirai::daemons(n_workers)
+  }
+
+  rush
+}
+
+start_rush_worker = function(n_workers = 2) {
+  config = redis_configuration()
+
+  network_id = paste(sample(LETTERS, 10), collapse = "")
+  rush = if (packageVersion("rush") <= "0.4.1") {
+    rush::RushWorker$new(network_id = network_id, config = config, remote = FALSE)
+  } else {
+    rush::RushWorker$new(network_id = network_id, config = config)
+  }
+
+  rush
+}
+
+# parses the string returned by rush$worker_script() and starts a processx process
+start_script_worker = function(script) {
+  script = sub('^Rscript\\s+-e\\s+\\"(.*)\\"$', '\\1', script, perl = TRUE)
+
+  px = processx::process$new("Rscript",
+    args = c("-e", script),
+    supervise = TRUE,
+    stderr = "|", stdout = "|")
+  px
+}