diff --git a/.Rbuildignore b/.Rbuildignore index 3107c3d..3b5b703 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -18,3 +18,5 @@ ^demo1\.png$ ^demo2\.png$ ^\.github$ +^DS_Store$ +^CRAN-SUBMISSION$ diff --git a/.github/workflows/pkgdown.yml b/.github/workflows/pkgdown.yml index d9c01d9..8b69e59 100644 --- a/.github/workflows/pkgdown.yml +++ b/.github/workflows/pkgdown.yml @@ -46,4 +46,4 @@ jobs: run: | git config --local user.email "actions@github.com" git config --local user.name "GitHub Actions" - Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)' + Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE, run_dont_run = TRUE)' diff --git a/.gitignore b/.gitignore index 9733197..a0f5a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ revdep/ inst/doc docker.sh docs/ +.DS_Store \ No newline at end of file diff --git a/DESCRIPTION b/DESCRIPTION index dbc0aa3..ca873bc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: parcats Title: Interactive Parallel Categories Diagrams for 'easyalluvial' -Version: 0.0.3 +Version: 0.0.4 Authors@R: person( "Bjoern", "Koneswarakantha", role = c("aut","cre"), email = "datistics@gmail.com", comment = c(ORCID = "0000-0003-4585-7799") ) URL: https://erblast.github.io/parcats/ BugReports: https://github.com/erblast/parcats/issues/ @@ -22,7 +22,7 @@ Suggests: spelling, plotly, shiny -RoxygenNote: 7.1.2 +RoxygenNote: 7.2.0 Imports: easyalluvial (>= 0.2.1.0), tidyr (>= 1.0.0), diff --git a/NAMESPACE b/NAMESPACE index a1648cb..82e57da 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,5 +1,6 @@ # Generated by roxygen2: do not edit by hand +export("%>%") export(parcats) export(parcatsOutput) export(parcats_demo) @@ -11,9 +12,11 @@ import(purrr) import(tidyr) importFrom(graphics,text) importFrom(htmlwidgets,createWidget) +importFrom(magrittr,"%>%") importFrom(stats,density) importFrom(stringr,str_extract) importFrom(stringr,str_split) +importFrom(tibble,tibble) importFrom(tidyr,nest) importFrom(tidyr,uncount) importFrom(utils,data) diff --git a/NEWS.md b/NEWS.md index 6d8c3b7..ab50b96 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +# parcats 0.0.4 +* updated package dependencies + # parcats 0.0.3 * upgraded packaged 'plotly.js' to v2.5.1 * fix shiny bug https://github.com/erblast/parcats/issues/6 diff --git a/R/parcats.R b/R/parcats.R index bbccc3d..34f8a82 100644 --- a/R/parcats.R +++ b/R/parcats.R @@ -579,7 +579,8 @@ get_shapes = function(traces){ #'@return htmlwidget #'@details most parameters are best left at default values #' @examples -#' +#' +#'\dontrun{ #'library(easyalluvial) #' #' # alluvial wide --------------------------------- @@ -589,7 +590,6 @@ get_shapes = function(traces){ #' #' parcats(p, marginal_histograms = TRUE, data_input = mtcars2) #' -#'\dontrun{ #' # alluvial for model response -------------------- #' df = mtcars2[, ! names(mtcars2) %in% 'ids' ] #' m = randomForest::randomForest( disp ~ ., df) @@ -619,6 +619,7 @@ get_shapes = function(traces){ #'@importFrom graphics text #'@importFrom stats density #'@importFrom utils data +#'@importFrom tibble tibble parcats <- function(p, marginal_histograms = TRUE, data_input = NULL , imp = TRUE , width = NULL, height = NULL, elementId = NULL @@ -798,8 +799,8 @@ render_parcats <- function(expr, env = parent.frame(), quoted = FALSE) { #' @title run parcats shiny demo #' @examples -#' \dontrun{ -#' parcats_demo() +#' if (interactive()) { +#' parcats_demo() #' } #' @rdname parcats_demo #' @export diff --git a/R/utils-pipe.R b/R/utils-pipe.R new file mode 100644 index 0000000..fd0b1d1 --- /dev/null +++ b/R/utils-pipe.R @@ -0,0 +1,14 @@ +#' Pipe operator +#' +#' See \code{magrittr::\link[magrittr:pipe]{\%>\%}} for details. +#' +#' @name %>% +#' @rdname pipe +#' @keywords internal +#' @export +#' @importFrom magrittr %>% +#' @usage lhs \%>\% rhs +#' @param lhs A value or the magrittr placeholder. +#' @param rhs A function call using the magrittr semantics. +#' @return The result of calling `rhs(lhs)`. +NULL diff --git a/cran-comments.md b/cran-comments.md index 2f6faab..038bfa7 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,22 +1,27 @@ -# parcats 0.0.3 -* upgraded packaged 'plotly.js' to v2.5.1 -* fix shiny bug https://github.com/erblast/parcats/issues/6 -* added shiny demo 'parcats_demo()' +# resubmission 0.0.4 - 1 +* changed example to dont run because it takes > 10s to execute on some CRAN test servers + +# parcats 0.0.4 +clean up package dependencies ## revdepcheck results -We checked 2 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package. +no reverse dependencies + +## Test Environments +* local macOS M1 R 4.2.1 +* Appveyor x86_64-w64-mingw32/x64 (64-bit) R 4.2.1 +* github actions macos-latest R 4.2.1 +* WinBuilder R 4.2.1 +* WinBuilder R devel + +## Test Results + +Maintainer: ‘Bjoern Koneswarakantha ’ - * We saw 0 new problems - * We failed to check 0 packages +New submission -## Test environments -* local macOS 10.14.6, R 4.0.3 -* ubuntu 14.04 (on travis-ci), R-release -* ubuntu 14.04 (on travis-ci), R-devel -* x86_64-w64-mingw32/x64 (on appveyor), R 4.0.1 -* Ubuntu Linux 16.04 LTS, R-release, GCC (R-Hub) -* Fedora Linux, R-devel, clang, gfo (R-Hub) -* Windows Server 2008 R2 SP1, R-devel, 32/64 bit -* Winbuilder, R-devel +Package was archived on CRAN +## Reverse Dependencies +no reverse dependencies diff --git a/inst/WORDLIST b/inst/WORDLIST index 591069c..f2d1734 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -12,6 +12,7 @@ github htmlwidget js js’ +magrittr metacran parcats’ parrallel diff --git a/man/parcats.Rd b/man/parcats.Rd index 2df9991..8f79d30 100644 --- a/man/parcats.Rd +++ b/man/parcats.Rd @@ -88,6 +88,7 @@ most parameters are best left at default values } \examples{ +\dontrun{ library(easyalluvial) # alluvial wide --------------------------------- @@ -97,7 +98,6 @@ parcats(p, marginal_histograms = FALSE) parcats(p, marginal_histograms = TRUE, data_input = mtcars2) -\dontrun{ # alluvial for model response -------------------- df = mtcars2[, ! names(mtcars2) \%in\% 'ids' ] m = randomForest::randomForest( disp ~ ., df) diff --git a/man/parcats_demo.Rd b/man/parcats_demo.Rd index ab2b727..30d8916 100644 --- a/man/parcats_demo.Rd +++ b/man/parcats_demo.Rd @@ -10,7 +10,7 @@ parcats_demo() run parcats shiny demo } \examples{ -\dontrun{ -parcats_demo() +if (interactive()) { + parcats_demo() } } diff --git a/man/pipe.Rd b/man/pipe.Rd new file mode 100644 index 0000000..1f8f237 --- /dev/null +++ b/man/pipe.Rd @@ -0,0 +1,20 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/utils-pipe.R +\name{\%>\%} +\alias{\%>\%} +\title{Pipe operator} +\usage{ +lhs \%>\% rhs +} +\arguments{ +\item{lhs}{A value or the magrittr placeholder.} + +\item{rhs}{A function call using the magrittr semantics.} +} +\value{ +The result of calling `rhs(lhs)`. +} +\description{ +See \code{magrittr::\link[magrittr:pipe]{\%>\%}} for details. +} +\keyword{internal}