Skip to content

Commit

Permalink
Merge pull request #14 from erblast/cran
Browse files Browse the repository at this point in the history
  • Loading branch information
erblast authored Jul 9, 2022
2 parents be80192 + 0ee23e6 commit 90a35de
Show file tree
Hide file tree
Showing 13 changed files with 76 additions and 26 deletions.
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@
^demo1\.png$
^demo2\.png$
^\.github$
^DS_Store$
^CRAN-SUBMISSION$
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,4 @@ jobs:
run: |
git config --local user.email "[email protected]"
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)'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ revdep/
inst/doc
docker.sh
docs/
.DS_Store
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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 = "[email protected]", comment = c(ORCID = "0000-0003-4585-7799") )
URL: https://erblast.github.io/parcats/
BugReports: https://github.com/erblast/parcats/issues/
Expand All @@ -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),
Expand Down
3 changes: 3 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Generated by roxygen2: do not edit by hand

export("%>%")
export(parcats)
export(parcatsOutput)
export(parcats_demo)
Expand All @@ -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)
3 changes: 3 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions R/parcats.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
14 changes: 14 additions & 0 deletions R/utils-pipe.R
Original file line number Diff line number Diff line change
@@ -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
37 changes: 21 additions & 16 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>

* 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
1 change: 1 addition & 0 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ github
htmlwidget
js
js’
magrittr
metacran
parcats’
parrallel
Expand Down
2 changes: 1 addition & 1 deletion man/parcats.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/parcats_demo.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions man/pipe.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 90a35de

Please sign in to comment.