fix of build failing dpcy

Author: matthewphamilton

.Rbuildignore

@@ -40,3 +40,5 @@
 ^data-raw/dataverse/abbreviations_lup/abbreviations_lup\.RDS$
 ^data-raw/dataverse/fn_type_lup_tb/fn_type_lup_tb\.csv$
 ^data-raw/dataverse/fn_type_lup_tb/fn_type_lup_tb\.RDS$
+^data-raw/dataverse/prototype_lup/prototype_lup\.csv$
+^data-raw/dataverse/prototype_lup/prototype_lup\.RDS$

NAMESPACE

@@ -1,9 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
 export("%>%")
-export("crs_nbr_dbl<-")
-export("merge_with_chr_vec<-")
-export("save_type<-")
 export(add_ds_to_dv_repo)
 export(add_dv_meta_to_imp_lup)
 export(add_files_to_dv)
@@ -14,7 +11,6 @@ export(assert_matches_chr)
 export(assert_single_row_tb)
 export(bind_lups)
 export(bind_lups.ready4_dictionary)
-export(crs_nbr_dbl)
 export(download_data)
 export(get_data)
 export(get_data.ready4_dv_import_lup)
@@ -48,7 +44,6 @@ export(make_pt_ready4_dist)
 export(make_pt_ready4_dv_import_lup)
 export(make_pt_ready4_par_struc_mape)
 export(make_r3_from_csv_tb)
-export(merge_with_chr_vec)
 export(read_import_from_csv)
 export(ready4_all_import_lup)
 export(ready4_dictionary)
@@ -57,7 +52,6 @@ export(ready4_dv_import_lup)
 export(ready4_par_struc_mape)
 export(remove_labels_from_ds)
 export(save_raw)
-export(save_type)
 export(transform_csv_col_to_ls_col)
 export(update_src_loc_to_url)
 export(update_src_loc_to_url.ready4_all_import_lup)
@@ -118,9 +112,9 @@ importFrom(ready4class,update_pt_fn_args_ls)
 importFrom(ready4fun,add_lups)
 importFrom(ready4fun,get_dev_pkg_nm)
 importFrom(ready4fun,get_from_lup_obj)
+importFrom(ready4fun,remove_lbls_from_df)
 importFrom(ready4fun,write_and_doc_ds)
 importFrom(rlang,exec)
-importFrom(sjlabelled,unlabel)
 importFrom(stats,setNames)
 importFrom(stringi,stri_locate_last_regex)
 importFrom(stringr,str_c)

R/db_prototype_lup.R

@@ -6,10 +6,10 @@
 #' 
 #' \describe{
 #'   \item{type_chr}{Type (a character vector)}
-#'   \item{val_chr}{Val (a character vector)}
+#'   \item{val_chr}{Value (a character vector)}
 #'   \item{pt_ns_chr}{Prototype namespace (a character vector)}
 #'   \item{fn_to_call_chr}{Function to call (a character vector)}
-#'   \item{default_val_chr}{Default val (a character vector)}
+#'   \item{default_val_chr}{Default value (a character vector)}
 #'   \item{old_class_lgl}{Old class (a logical vector)}
 #' }
 "prototype_lup"

R/fn_add.R

@@ -143,18 +143,18 @@ add_files_to_dv <- function (files_tb, data_dir_rt_1L_chr = ".", ds_url_1L_chr,
 #' @return Labelled dataset (a tibble)
 #' @rdname add_labels_from_dictionary
 #' @export 
-#' @importFrom sjlabelled unlabel
+#' @importFrom ready4fun remove_lbls_from_df
 #' @importFrom dplyr filter mutate case_when
 #' @importFrom purrr reduce
 #' @importFrom Hmisc label
 #' @keywords internal
 add_labels_from_dictionary <- function (ds_tb, dictionary_tb, remove_old_lbls_1L_lgl = F) 
 {
     if (remove_old_lbls_1L_lgl) 
-        ds_tb <- ds_tb %>% sjlabelled::unlabel()
+        ds_tb <- ds_tb %>% ready4fun::remove_lbls_from_df()
     data_dictionary_tb <- dictionary_tb %>% dplyr::filter(var_nm_chr %in% 
         names(ds_tb)) %>% dplyr::mutate(var_desc_chr = dplyr::case_when(is.na(var_desc_chr) ~ 
-        var_nm_chr, TRUE ~ var_desc_chr)) %>% sjlabelled::unlabel()
+        var_nm_chr, TRUE ~ var_desc_chr)) %>% ready4fun::remove_lbls_from_df()
     if (nrow(data_dictionary_tb) > 0) {
         labelled_ds_tb <- seq_len(nrow(data_dictionary_tb)) %>% 
             purrr::reduce(.init = ds_tb, ~{

R/gnrc_crs_nbr_dbl.R renamed to R/gs_crs_nbr_dbl.R

@@ -1,12 +1,4 @@
 #' crs_nbr_dbl
-#' @description S4 Generic function to get the value of the slot crs_nbr_dbl
-#' @rdname crs_nbr_dbl-methods
-#' @param x An object 
-#' 
-#' @export
-
-methods::setGeneric("crs_nbr_dbl", function(x) standardGeneric("crs_nbr_dbl"))
-#' crs_nbr_dbl
 #' @name crs_nbr_dbl-ready4_script_data
 #' @description Get the value of the slot crs_nbr_dbl for S4 objects of class ready4_script_data
 #' @param x An object of class ready4_script_data
@@ -17,15 +9,6 @@ methods::setMethod("crs_nbr_dbl", methods::className("ready4_script_data"), func
     x@crs_nbr_dbl
 })
 #' crs_nbr_dbl<-
-#' @description S4 Generic function to set the value of the slot crs_nbr_dbl
-#' @rdname crs_nbr_dbl_set-methods
-#' @param x An object 
-#' @param value Value to be assigned to x
-#' 
-#' @export
-
-methods::setGeneric("crs_nbr_dbl<-", function(x, value) standardGeneric("crs_nbr_dbl<-"))
-#' crs_nbr_dbl<-
 #' @name crs_nbr_dbl<--ready4_script_data
 #' @description Set the value of the slot crs_nbr_dbl for S4 objects of class ready4_script_data
 #' @param x An object of class ready4_script_data

R/gnrc_merge_with_chr_vec.R renamed to R/gs_merge_with_chr_vec.R

@@ -1,12 +1,4 @@
 #' merge_with_chr_vec
-#' @description S4 Generic function to get the value of the slot merge_with_chr_vec
-#' @rdname merge_with_chr_vec-methods
-#' @param x An object 
-#' 
-#' @export
-
-methods::setGeneric("merge_with_chr_vec", function(x) standardGeneric("merge_with_chr_vec"))
-#' merge_with_chr_vec
 #' @name merge_with_chr_vec-ready4_local
 #' @description Get the value of the slot merge_with_chr_vec for S4 objects of class ready4_local
 #' @param x An object of class ready4_local
@@ -17,15 +9,6 @@ methods::setMethod("merge_with_chr_vec", methods::className("ready4_local"), fun
     x@merge_with_chr_vec
 })
 #' merge_with_chr_vec<-
-#' @description S4 Generic function to set the value of the slot merge_with_chr_vec
-#' @rdname merge_with_chr_vec_set-methods
-#' @param x An object 
-#' @param value Value to be assigned to x
-#' 
-#' @export
-
-methods::setGeneric("merge_with_chr_vec<-", function(x, value) standardGeneric("merge_with_chr_vec<-"))
-#' merge_with_chr_vec<-
 #' @name merge_with_chr_vec<--ready4_local
 #' @description Set the value of the slot merge_with_chr_vec for S4 objects of class ready4_local
 #' @param x An object of class ready4_local

R/gnrc_save_type.R renamed to R/gs_save_type.R

@@ -1,12 +1,4 @@
 #' save_type
-#' @description S4 Generic function to get the value of the slot save_type
-#' @rdname save_type-methods
-#' @param x An object 
-#' 
-#' @export
-
-methods::setGeneric("save_type", function(x) standardGeneric("save_type"))
-#' save_type
 #' @name save_type-ready4_local_raw
 #' @description Get the value of the slot save_type for S4 objects of class ready4_local_raw
 #' @param x An object of class ready4_local_raw
@@ -17,15 +9,6 @@ methods::setMethod("save_type", methods::className("ready4_local_raw"), function
     x@save_type
 })
 #' save_type<-
-#' @description S4 Generic function to set the value of the slot save_type
-#' @rdname save_type_set-methods
-#' @param x An object 
-#' @param value Value to be assigned to x
-#' 
-#' @export
-
-methods::setGeneric("save_type<-", function(x, value) standardGeneric("save_type<-"))
-#' save_type<-
 #' @name save_type<--ready4_local_raw
 #' @description Set the value of the slot save_type for S4 objects of class ready4_local_raw
 #' @param x An object of class ready4_local_raw

_pkgdown.yml

@@ -1,9 +1,3 @@
-home:
-  links:
-  - text: User manual (PDF)
-    href: https://github.com/ready4-dev/ready4use/releases/download/v0.0.0.9117/ready4use_user_0.0.0.9117.pdf
-  - text: Developer version of usual manual (PDF)
-    href: https://github.com/ready4-dev/ready4use/releases/download/v0.0.0.9117/ready4use_developer_0.0.0.9117.pdf
 development:
   mode: auto
 reference:

data-raw/DATASET.R

@@ -122,8 +122,8 @@ ready4fun::write_and_doc_fn_fls(fns_dmt_tb,
 ## PAUSE FOR INTERACTIV
 data("prototype_lup")
 prototype_lup %>%
-  write_paired_ds_fls_to_dv(fl_nm_1L_chr = "abbreviations_lup",
-                            desc_1L_chr = "Abbreviations lookup table")
+  write_paired_ds_fls_to_dv(fl_nm_1L_chr = "prototype_lup",
+                            desc_1L_chr = "Prototypes lookup table")
 ##
 ready4fun::write_links_for_website(user_manual_url_1L_chr = "https://github.com/ready4-dev/ready4use/releases/download/v0.0.0.9117/ready4use_user_0.0.0.9117.pdf",
 developer_manual_url_1L_chr = "https://github.com/ready4-dev/ready4use/releases/download/v0.0.0.9117/ready4use_developer_0.0.0.9117.pdf")

data-raw/MAKE_HOUSESTYLE_DSS.R

@@ -1,3 +1,4 @@
+library(magrittr)
 ready4fun::read_fns("data-raw/fns")
 source("data-raw/MAKE_CLASSES.R")
 abbreviations_lup <- ready4fun::get_rds_from_dv("abbreviations_lup")