cran submission 1.1.0

IndrajeetPatil · Jun 19, 2020 · 60510fa · 60510fa · lintr-bot · Jun 19, 2020
1 parent b3da19b
commit 60510fa
Show file tree

Hide file tree

Showing 32 changed files with 476 additions and 497 deletions.
diff --git a/CRAN-RELEASE b/CRAN-RELEASE
@@ -1,2 +1,2 @@
-This package was submitted to CRAN on 2020-05-29.
-Once it is accepted, delete this file and tag the release (commit 5f04f77c22).
+This package was submitted to CRAN on 2020-06-19.
+Once it is accepted, delete this file and tag the release (commit b3da19b01d).
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -28,23 +28,20 @@ Imports:
     dplyr,
     dunn.test,
     forcats,
-    ipmisc (>= 3.0.0.9000),
+    ipmisc (>= 3.0.1),
     PMCMRplus,
     purrr,
     rlang,
     stats,
-    tidyBF (>= 0.2.0.9000),
+    tidyBF (>= 0.2.1),
     tidyr,
     utils,
-    WRS2
+    WRS2 (>= 1.1-0)
 Suggests:
     knitr,
     rmarkdown,
     spelling,
     testthat
-Remotes:
-    IndrajeetPatil/ipmisc,
-    IndrajeetPatil/tidyBF
 Encoding: UTF-8
 Language: en-US
 LazyData: true

diff --git a/NAMESPACE b/NAMESPACE
@@ -6,6 +6,7 @@ export("%<>%")
 export("%>%")
 export("%|%")
 export("%||%")
+export(":=")
 export(as_tibble)
 export(enframe)
 export(long_to_wide_converter)
@@ -21,7 +22,6 @@ importFrom(WRS2,lincon)
 importFrom(WRS2,rmmcp)
 importFrom(broomExtra,easystats_to_tidy_names)
 importFrom(broomExtra,tidy)
-importFrom(dplyr,arrange)
 importFrom(dplyr,bind_cols)
 importFrom(dplyr,everything)
 importFrom(dplyr,full_join)

diff --git a/NEWS.md b/NEWS.md
@@ -3,6 +3,8 @@
   - For repeated measures datasets with `NA`s present, the Bayes Factor values
     were incorrect. This is fixed.
 
+  - Internal refactoring to improve data wrangling using `ipmisc`.
+
 # pairwiseComparisons 1.0.0
 
   - Removes dependence on `jmv` and instead relies on `dunn.test` and

diff --git a/R/helpers.R b/R/helpers.R
@@ -26,23 +26,4 @@ p_adjust_column_adder <- function(df, p.adjust.method) {
   df %>%
     dplyr::mutate(p.value = stats::p.adjust(p = p.value, method = p.adjust.method)) %>%
     signif_column(data = ., p = p.value)
-}
-
-
-#' @name df_cleanup_paired
-#'
-#' @importFrom rlang :=
-#' @importFrom dplyr rename select arrange mutate
-#' @importFrom tidyr gather
-#'
-#' @noRd
-#' @keywords internal
-
-df_cleanup_paired <- function(data, x, y) {
-  data %>%
-    long_to_wide_converter(data = ., x = {{ x }}, y = {{ y }}) %>%
-    tidyr::gather(data = ., key, value, -rowid) %>%
-    dplyr::arrange(.data = ., rowid) %>%
-    dplyr::rename(.data = ., {{ x }} := key, {{ y }} := value) %>%
-    dplyr::mutate(.data = ., {{ x }} := factor({{ x }}))
-}
+}
diff --git a/R/pairwise_comparisons.R b/R/pairwise_comparisons.R
@@ -369,6 +369,9 @@ pairwise_comparisons <- function(data,
   # ---------------------------- robust ----------------------------------
 
   if (type == "robust") {
+    # data cleanup
+    df_internal %<>% long_to_wide_converter(., {{ x }}, {{ y }}, paired, FALSE)
+
     if (isFALSE(paired)) {
       # object with all details about pairwise comparisons
       rob_pairwise_df <-
@@ -382,8 +385,6 @@ pairwise_comparisons <- function(data,
     # converting to long format and then getting it back in wide so that the
     # rowid variable can be used as the block variable
     if (isTRUE(paired)) {
-      df_internal %<>% df_cleanup_paired(data = ., x = {{ x }}, y = {{ y }})
-
       # running pairwise multiple comparison tests
       rob_pairwise_df <-
         WRS2::rmmcp(

diff --git a/R/reexports.R b/R/reexports.R
@@ -25,6 +25,10 @@ rlang::`%||%`
 #' @importFrom rlang "%|%"
 rlang::`%|%`
 
+#' @export
+#' @importFrom rlang ":="
+rlang::`:=`
+
 #' @export
 #' @importFrom ipmisc tibble
 ipmisc::tibble

diff --git a/codemeta.json b/codemeta.json
@@ -159,14 +159,14 @@
       "@type": "SoftwareApplication",
       "identifier": "ipmisc",
       "name": "ipmisc",
-      "version": ">= 3.0.0.9000",
+      "version": ">= 3.0.1",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
         "name": "Comprehensive R Archive Network (CRAN)",
         "url": "https://cran.r-project.org"
       },
-      "sameAs": "https://github.com/IndrajeetPatil/ipmisc"
+      "sameAs": "https://CRAN.R-project.org/package=ipmisc"
     },
     {
       "@type": "SoftwareApplication",
@@ -213,14 +213,14 @@
       "@type": "SoftwareApplication",
       "identifier": "tidyBF",
       "name": "tidyBF",
-      "version": ">= 0.2.0.9000",
+      "version": ">= 0.2.1",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
         "name": "Comprehensive R Archive Network (CRAN)",
         "url": "https://cran.r-project.org"
       },
-      "sameAs": "https://github.com/IndrajeetPatil/tidyBF"
+      "sameAs": "https://CRAN.R-project.org/package=tidyBF"
     },
     {
       "@type": "SoftwareApplication",
@@ -243,6 +243,7 @@
       "@type": "SoftwareApplication",
       "identifier": "WRS2",
       "name": "WRS2",
+      "version": ">= 1.1-0",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
@@ -277,5 +278,5 @@
     "name": "Comprehensive R Archive Network (CRAN)",
     "url": "https://cran.r-project.org"
   },
-  "fileSize": "1480.258KB"
+  "fileSize": "1485.799KB"
 }
diff --git a/cran-comments.md b/cran-comments.md
@@ -5,4 +5,8 @@
 
 ## R CMD check results
 
-0 errors | 0 warnings | 0 note
+0 errors | 0 warnings | 0 note
+
+  - Gets rid of `NOTE` produced in daily CRAN checks.
+
+  - Makes package compatible with new release of `ipmisc` and `tidyBF`.
diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CODE_OF_CONDUCT.html b/docs/CODE_OF_CONDUCT.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/SUPPORT.html b/docs/SUPPORT.html
diff --git a/docs/authors.html b/docs/authors.html