Skip to content

Commit 4f71de9

Browse files
CLEANUP: Remove internal workaround for fiery (<= 1.2.1); no longer needed for fiery (>= 1.3.0)
1 parent 67f4e0c commit 4f71de9

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ revdep/data.sqlite
2323
revdep/checks/*
2424
revdep/library/*
2525
.Rdump
26+
.local/gh

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: future
2-
Version: 1.67.0-9009
2+
Version: 1.67.0-9010
33
Title: Unified Parallel and Distributed Processing in R for Everyone
44
Depends:
55
R (>= 3.2.0)
@@ -43,7 +43,7 @@ URL: https://future.futureverse.org, https://github.com/futureverse/future
4343
BugReports: https://github.com/futureverse/future/issues
4444
Language: en-US
4545
Encoding: UTF-8
46-
RoxygenNote: 7.3.2
46+
RoxygenNote: 7.3.3
4747
Roxygen: list(markdown = TRUE)
4848
Collate:
4949
'000.bquote.R'

R/backend_api-11.SequentialFutureBackend-class.R

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -182,16 +182,7 @@ getFutureBackendConfigs.UniprocessFuture <- function(future, ...) {
182182
#' @aliases uniprocess
183183
#' @export
184184
sequential <- function(..., envir = parent.frame()) {
185-
## WORKAROUNDS:
186-
## (1) fiery calls sequential() directly
187-
## https://github.com/thomasp85/fiery/issues/53
188-
if (!"fiery" %in% loadedNamespaces()) {
189-
stop("The future::sequential() function must never be called directly")
190-
}
191-
192-
f <- Future(..., envir = envir)
193-
class(f) <- c("SequentialFuture", "UniprocessFuture", "Future")
194-
f
185+
stop("The future::sequential() function must never be called directly")
195186
}
196187
class(sequential) <- c("sequential", "uniprocess", "future", "function")
197188
attr(sequential, "init") <- TRUE

man/cancel.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/makeClusterFuture.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)