Skip to content

Commit f016c3d

Browse files
committed
tag v0.10.0; remove deprecated code
1 parent f83af59 commit f016c3d

4 files changed

Lines changed: 6 additions & 41 deletions

File tree

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: clustermq
22
Title: Evaluate Function Calls on HPC Schedulers (LSF, SGE, GCS, OCS, SLURM, PBS/Torque)
3-
Version: 0.9.10
3+
Version: 0.10.0
44
Authors@R: c(
55
person('Michael', 'Schubert', email='mschu.dev@gmail.com',
66
role = c('aut', 'cre', 'cph'),

NEWS.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
1-
# clustermq 0.9.10
1+
# clustermq 0.10.0
22

3+
* Add GCS and OCS schedulers (#342) @ernst-bablick
34
* Fix a bug where `Sys.sleep` was evaluated on the master (#340) @wlandau
45
* Worker API: rename `send` to `send_eval`, deprecate `send_wait`
6+
* Explicit setting of common data (deprecated in `0.9.0`) is removed
7+
* Template field `CMQ_AUTH` is now obligatory
58

69
# clustermq 0.9.9
710

R/pool.r

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -59,34 +59,6 @@ Pool = R6::R6Class("Pool",
5959
private$master$add_pkg(elm)
6060
},
6161

62-
### START pre-0.9 compatibility functions (deprecated)
63-
set_common_data = function(..., export=list(), pkgs=c(), token="") {
64-
.Deprecated("env")
65-
do.call(self$env, c(list(...), export))
66-
if (length(pkgs) > 0)
67-
do.call(self$pkg, as.list(pkgs))
68-
private$token = token
69-
},
70-
send_common_data = function() {
71-
.Deprecated("handled implicitly")
72-
self$send()
73-
},
74-
send_shutdown_worker = function() {
75-
.Deprecated("send_shutdown")
76-
self$send_shutdown()
77-
},
78-
send_call = function(expr, env=list(), ref=substitute(expr)) {
79-
.Deprecated("send")
80-
pcall = quote(substitute(expr))
81-
do.call(self$send, c(list(cmd=eval(pcall)), env))
82-
},
83-
receive_data = function() {
84-
.Deprecated("recv")
85-
rd = self$recv()
86-
list(result=rd, warnings=c(), errors=c(), token=private$token)
87-
},
88-
### END pre-0.9 compatibility functions (deprecated)
89-
9062
send_eval = function(cmd, ...) {
9163
pcall = quote(substitute(cmd))
9264
cmd = as.expression(do.call(substitute, list(eval(pcall), env=list(...))))
@@ -145,8 +117,6 @@ Pool = R6::R6Class("Pool",
145117
),
146118

147119
private = list(
148-
token = NULL, ### pre-0.9 compatibility functions (deprecated)
149-
150120
master = NULL,
151121
addr = NULL,
152122
timer = NULL,

R/qsys.r

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,7 @@ QSys = R6::R6Class("QSys",
5151
fill_options = function(...) {
5252
values = utils::modifyList(private$defaults, list(...))
5353
values$master = private$addr
54-
if (grepl("CMQ_AUTH", private$template)) {
55-
# note: auth will be obligatory in the future and this check will
56-
# be removed (i.e., filling will fail if no field in template)
57-
values$auth = paste(sample(letters, 5, TRUE), collapse="")
58-
} else {
59-
values$auth = NULL
60-
warning("Add 'CMQ_AUTH={{ auth }}' to template to enable socket authentication",
61-
immediate.=TRUE)
62-
}
54+
values$auth = paste(sample(letters, 5, TRUE), collapse="")
6355
if (!"job_name" %in% names(values))
6456
values$job_name = paste0("cmq", private$port)
6557
private$workers_total = values$n_jobs

0 commit comments

Comments
 (0)