Skip to content

Commit 4e14119

Browse files
CLEANUP: Remove patch for the 'WARDEN' package - a fixed version of that package is now on CRAN
1 parent e30e731 commit 4e14119

File tree

3 files changed

+1
-45
lines changed

3 files changed

+1
-45
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: doFuture
2-
Version: 1.0.2-9000
2+
Version: 1.0.2-9001
33
Title: Use Foreach to Parallelize via the Future Framework
44
Depends:
55
foreach (>= 1.5.0),

R/dofuture_OP.R

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,6 @@ doFuture2 <- function(obj, expr, envir, data) { #nolint
390390
dummy_globals <- bquote_apply(tmpl_dummy_globals)
391391
}
392392

393-
## Apply temporary patches?
394-
optional_patches <- patch_expressions()
395-
396393
## With or without RNG?
397394
if (is.null(seeds)) {
398395
seed_assignment <- NULL
@@ -856,8 +853,6 @@ tmpl_dummy_globals <- bquote_compile({
856853

857854

858855
tmpl_expr_with_rng <- bquote_compile({
859-
.(optional_patches)
860-
861856
"# doFuture():::doFuture2(): process chunk of elements"
862857
lapply(seq_along(...future.x_ii), FUN = function(jj) {
863858
...future.x_jj <- ...future.x_ii[[jj]] #nolint

R/zzz.R

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,6 @@ future_has_evalFuture <- local({
7474
}
7575
})
7676

77-
patch_expressions <- function() {
78-
## Temporary patches for future package with evalFuture()
79-
patches <- getOption("doFuture.patches")
80-
if (is.null(patches)) {
81-
patches <- NA_character_
82-
if (future_has_evalFuture()) {
83-
## Package 'WARDEN', if 'R CMD check' is running
84-
if ("WARDEN" %in% loadedNamespaces() && inRCmdCheck()) {
85-
patches <- c(patches, "WARDEN")
86-
}
87-
}
88-
options(doFuture.patches = patches)
89-
}
90-
91-
optional_patches <- NULL
92-
if (!is.null(patches)) {
93-
if ("WARDEN" %in% patches) {
94-
optional_patches <- bquote({
95-
.(optional_patches)
96-
T <- TRUE
97-
})
98-
}
99-
}
100-
101-
optional_patches
102-
}
103-
10477

10578
## covr: skip=all
10679
.onLoad <- function(libname, pkgname) {
@@ -125,16 +98,4 @@ patch_expressions <- function() {
12598
}
12699
options(doFuture.globals.scanVanillaExpression = value)
127100
}
128-
129-
## doFuture 1.1.0
130-
value <- getOption("doFuture.patches")
131-
if (is.null(value)) {
132-
value <- Sys.getenv("R_DOFUTURE_PATCHES", NA_character_)
133-
if (is.na(value) || !nzchar(value)) {
134-
value <- NULL
135-
} else {
136-
value <- strsplit(value, split = ",", fixed = TRUE)[[1]]
137-
}
138-
options(doFuture.patches = value)
139-
}
140101
}

0 commit comments

Comments
 (0)