Skip to content

Commit

Permalink
Fix #1375
Browse files Browse the repository at this point in the history
  • Loading branch information
wlandau committed Nov 14, 2024
1 parent 846a2d4 commit eb28e3e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 7 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Description: Pipeline tools coordinate the pieces of computationally
The methodology in this package
borrows from GNU 'Make' (2015, ISBN:978-9881443519)
and 'drake' (2018, <doi:10.21105/joss.00550>).
Version: 1.8.0.9014
Version: 1.8.0.9015
License: MIT + file LICENSE
URL: https://docs.ropensci.org/targets/, https://github.com/ropensci/targets
BugReports: https://github.com/ropensci/targets/issues
Expand Down
8 changes: 7 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# targets 1.8.0.9014 (development)
# targets 1.8.0.9015 (development)

## Improvements

* Un-break workflows that use `format = "file_fast"` (#1339, @koefoeden).
* Fix deadlock in `error = "trim"` (#1340, @koefoeden).
Expand All @@ -22,6 +24,10 @@
* Back-compatibly switch `format = "qs"` from `qs` to `qs2` (#1373).
* Add `tar_unblock_process()`.

## Potentially invalidating changes

* Add `"keepNA"` and `"keepInteger"` to `.deparseOpts()` (#1375). This may cause existing pipelines to rerun, but it makes add-ons like `tarchetypes::tar_map()` much easier to use.

# targets 1.8.0

* Wrap `tar_watch()` UI module in `bslib::page()` (#1302, @kwbyron-lilly).
Expand Down
6 changes: 3 additions & 3 deletions R/utils_assert.R
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@ tar_assert_store_noninvalidating <- function(store, threshold, prompt) {
version_old,
". Just after version ",
threshold,
", {targets} made changes that cause the targets in old pipelines ",
", {targets} made changes that may cause the targets in old pipelines ",
"to rerun. For details, please see ",
"https://github.com/ropensci/targets/blob/main/NEWS.md. Sorry for the ",
"inconvenience. As a workaround, you can either rerun this pipeline ",
Expand Down Expand Up @@ -795,8 +795,8 @@ tar_assert_allow_meta <- function(fun, store) {
" attempted to run targets::",
fun,
"() to during a pipeline, which is unsupported ",
"except when format %in% c(\"file\", \"file_fast\") and ",
"repository == \"local\", or if you are reading from a data store ",
"except when format is \"file\" and ",
"repository is \"local\", or if you are reading from a data store ",
"that does not belong to the current pipeline. ",
"This is because functions like ",
fun,
Expand Down
2 changes: 1 addition & 1 deletion R/utils_callr.R
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ callr_outer <- function(
tar_assert_nzchar(store)
choice <- tar_assert_store_noninvalidating(
store,
threshold = "1.6.0",
threshold = "1.8.0",
prompt = grepl("^tar_make", fun)
)
# Tested in tests/interactive/test-tar_assert_store_noninvalidating.R
Expand Down
4 changes: 3 additions & 1 deletion R/utils_language.R
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ tar_deparse_safe <- function(expr, collapse = "\n", backtick = TRUE) {
out
}

deparse_control_custom <- .deparseOpts(c("keepNA", "keepInteger"))
deparse_control_custom <- .deparseOpts(
c("keepInteger", "showAttributes", "keepNA", "niceNames")
)

deparse_direct <- function(...) {
produce_deparse_direct()(...)
Expand Down
1 change: 1 addition & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Badi
unevaluated
Baltagi
batchtools
ons
th
performant
bdbfcddb
Expand Down

0 comments on commit eb28e3e

Please sign in to comment.