remove tibble dependence

IndrajeetPatil · Apr 7, 2020 · 79e5268 · 79e5268
1 parent 703dc5b
commit 79e5268
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 69 deletions.
diff --git a/.github/workflows/check-full.yaml b/.github/workflows/check-full.yaml
@@ -19,7 +19,7 @@ jobs:
       matrix:
         config:
           - {os: windows-latest, r: '3.6', args: "--no-manual"}
-          - {os: windows-latest, r: 'devel', args: "--no-manual"}
+          #- {os: windows-latest, r: 'devel', args: "--no-manual"}
           - {os: macOS-latest, r: '3.6', args: "--no-manual"}
           #- {os: macOS-latest, r: 'devel', args: "--no-manual"}
           - {os: ubuntu-16.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest", args: "--no-manual"}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -27,7 +27,6 @@ Imports:
     ipmisc,
     metaBMA,
     rlang,
-    tibble,
     tidyr
 Suggests: 
     ggplot2,

diff --git a/NAMESPACE b/NAMESPACE
@@ -38,11 +38,13 @@ importFrom(ipmisc,"%$%")
 importFrom(ipmisc,"%<-%")
 importFrom(ipmisc,"%<>%")
 importFrom(ipmisc,"%>%")
+importFrom(ipmisc,as_tibble)
 importFrom(ipmisc,blue)
 importFrom(ipmisc,long_to_wide_converter)
 importFrom(ipmisc,red)
 importFrom(ipmisc,signif_column)
 importFrom(ipmisc,specify_decimal_p)
+importFrom(ipmisc,tibble)
 importFrom(metaBMA,meta_random)
 importFrom(metaBMA,prior)
 importFrom(rlang,"!!")
@@ -53,8 +55,5 @@ importFrom(rlang,enquo)
 importFrom(rlang,ensym)
 importFrom(rlang,new_formula)
 importFrom(rlang,quo_is_null)
-importFrom(tibble,as_tibble)
-importFrom(tibble,enframe)
-importFrom(tibble,tibble)
 importFrom(tidyr,drop_na)
 importFrom(tidyr,uncount)
diff --git a/R/bf_corr_test.R b/R/bf_corr_test.R
@@ -22,20 +22,21 @@
 #' # for reproducibility
 #' set.seed(123)
 #'
-#' # to get caption (default)
+#' # to see results
 #' bf_corr_test(
 #'   data = anscombe,
 #'   x = x1,
 #'   y = y4,
 #'   bf.prior = 1
 #' )
 #'
-#' # to see results
+#' # to get caption
 #' bf_corr_test(
 #'   data = anscombe,
 #'   x = x1,
 #'   y = y4,
-#'   bf.prior = 0.8
+#'   bf.prior = 0.8,
+#'   output = "null"
 #' )
 #' @export
 

diff --git a/R/helpers_bf_tests.R b/R/helpers_bf_tests.R
@@ -5,9 +5,11 @@
 #' @param ... Currently ignored.
 #'
 #' @importFrom BayesFactor extractBF
-#' @importFrom tibble enframe
 #' @importFrom dplyr rename select mutate
 #'
+#' @note *Important*: don't enter `1/bf_obj` to extract results for null
+#'   hypothesis; # doing so will return wrong results.
+#'
 #' @examples
 #' set.seed(123)
 #'
@@ -20,8 +22,6 @@
 #'   )
 #'
 #' # extracting Bayes Factors in a dataframe
-#' # *important*: don't enter `1/bf_obj` to extract results for null hypothesis;
-#' # doing so will return wrong results
 #' bf_extractor(bf_obj)
 #' @export
 
@@ -72,17 +72,14 @@ bf_extractor <- function(bf.object, ...) {
 #'
 #' # creating caption (for null)
 #' bf_expr(
-#'   bf.df = bf.df,
+#'   bf.df,
 #'   output = "null",
 #'   k = 3,
 #'   caption = "Note: Iris dataset"
 #' )
 #'
 #' # creating caption (for alternative)
-#' bf_expr(
-#'   bf.df = bf.df,
-#'   output = "alternative"
-#' )
+#' bf_expr(bf.df, output = "alternative")
 #' }
 #' @export
 

diff --git a/R/reexports.R b/R/reexports.R
@@ -40,12 +40,12 @@ rlang::`%||%`
 rlang::`%|%`
 
 #' @export
-#' @importFrom tibble tibble
-tibble::tibble
+#' @importFrom ipmisc tibble
+ipmisc::tibble
 
 #' @export
-#' @importFrom tibble as_tibble
-tibble::as_tibble
+#' @importFrom ipmisc as_tibble
+ipmisc::as_tibble
 
 # ----------------------- metaBMA -------------------------------------
 

diff --git a/codemeta.json b/codemeta.json
@@ -177,18 +177,6 @@
       },
       "sameAs": "https://CRAN.R-project.org/package=rlang"
     },
-    {
-      "@type": "SoftwareApplication",
-      "identifier": "tibble",
-      "name": "tibble",
-      "provider": {
-        "@id": "https://cran.r-project.org",
-        "@type": "Organization",
-        "name": "Comprehensive R Archive Network (CRAN)",
-        "url": "https://cran.r-project.org"
-      },
-      "sameAs": "https://CRAN.R-project.org/package=tibble"
-    },
     {
       "@type": "SoftwareApplication",
       "identifier": "tidyr",

diff --git a/docs/reference/bf_corr_test.html b/docs/reference/bf_corr_test.html
diff --git a/docs/reference/bf_expr.html b/docs/reference/bf_expr.html
diff --git a/docs/reference/bf_extractor.html b/docs/reference/bf_extractor.html
diff --git a/docs/reference/reexports.html b/docs/reference/reexports.html
diff --git a/man/bf_corr_test.Rd b/man/bf_corr_test.Rd
diff --git a/man/bf_expr.Rd b/man/bf_expr.Rd
diff --git a/man/bf_extractor.Rd b/man/bf_extractor.Rd
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/tests/testthat/test-bf_expr.R b/tests/testthat/test-bf_expr.R
@@ -8,10 +8,15 @@ testthat::test_that(
 
     # bayes factor results
     set.seed(123)
-    bf_results <- tibble::tribble(
-      ~log_e_bf01, ~bf.prior,
-      1.1, 0.88
-    )
+    bf_results <-
+      structure(
+        list(log_e_bf01 = 1.1, bf.prior = 0.88),
+        row.names = c(
+          NA,
+          -1L
+        ),
+        class = c("tbl_df", "tbl", "data.frame")
+      )
 
     # expected
     using1 <- bf_expr(