Skip to content

Commit 3ae0e0b

Browse files
committed
WIP - Tibble 3.0 updates.
1 parent 3d1a71c commit 3ae0e0b

35 files changed

+1500
-117
lines changed

.Rbuildignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
^renv$
2+
^renv\.lock$
13
^CRAN-RELEASE$
24
^.*\.Rproj$
35
^\.Rproj\.user$

.Rprofile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
source("renv/activate.R")

DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Imports:
3030
vctrs,
3131
viridis
3232
Roxygen: list(markdown = TRUE)
33-
RoxygenNote: 6.1.1
33+
RoxygenNote: 7.0.2
3434
Suggests:
3535
DT,
3636
EnvStats,

NAMESPACE

-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ importFrom(readr,write_csv)
123123
importFrom(readxl,read_excel)
124124
importFrom(rlang,.data)
125125
importFrom(rlang,as_function)
126-
importFrom(rlang,as_list)
127126
importFrom(rlang,ensym)
128127
importFrom(rlang,exec)
129128
importFrom(rlang,list2)

R/encode.R

+4-2
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,9 @@ encode_scenarios <- function(scenarios, capabilities, mappings) {
7979
#' IDs.
8080
#'
8181
#' @importFrom dplyr filter select
82-
#' @importFrom rlang .data set_names as_list
82+
#' @importFrom rlang .data set_names
8383
#' @importFrom stringi stri_split_fixed
84+
#' @importFrom vctrs vec_cast
8485
#' @param capability_ids Comma-delimited list of capabilities in scope for a scenario.
8586
#' @param capabilities Dataframe of master list of all qualitative capabilities.
8687
#'
@@ -96,7 +97,8 @@ derive_control_key <- function(capability_ids, capabilities) {
9697
control_frame <- dplyr::filter(capabilities, .data$capability_id %in% control_list) %>%
9798
dplyr::select(.data$capability_id, .data$capability)
9899

99-
rlang::as_list(control_frame$capability) %>%
100+
#rlang::as_list(control_frame$capability) %>%
101+
vctrs::vec_cast(control_frame$capability, to = list()) %>%
100102
rlang::set_names(control_frame$capability_id)
101103

102104
}

man/compare_tef_vuln.Rd

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/evaluator-deprecated.Rd

+4-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/evaluator.Rd

-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/explore_scenarios.Rd

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/exposure_histogram.Rd

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/generate_event_outcomes_plot.Rd

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/generate_heatmap.Rd

+7-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/generate_report.Rd

+13-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/generate_scatterplot-deprecated.Rd

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/get_mean_control_strength.Rd

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/import_spreadsheet.Rd

+5-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/loss_exceedance_curve.Rd

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/loss_scatterplot.Rd

+6-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/openfair_tef_tc_diff_lm.Rd

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/openfair_tef_tc_diff_plm_sr.Rd

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/risk_dashboard.Rd

+8-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/run_simulation.Rd

+7-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/run_simulations.Rd

+8-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/sample_diff.Rd

+9-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)