1.50.5 released to CRAN (#211)

cb4ds · Jun 24, 2024 · b2dbe61 · b2dbe61
1 parent 8ec72bc
commit b2dbe61
Show file tree

Hide file tree

Showing 68 changed files with 6,192 additions and 6,652 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -13,3 +13,4 @@
 ^\.circleci$
 ^CRAN-SUBMISSION$
 ^_ARCHIVE
+^\.github
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -53,9 +53,9 @@ jobs:
             # Perform package check
             R CMD check *tar.gz
 
-  Build-for-r4_2_3:
+  Build-for-r4_3_3:
     docker:
-      - image: rocker/verse:4.0.5
+      - image: rocker/verse:4.3.3
 
     steps:
       - checkout
@@ -156,5 +156,5 @@ workflows:
   Prepare-All-R-Editions:
     jobs:
       - Build-for-r4_0_5
-      - Build-for-r4_2_3
+      - Build-for-r4_3_3
       - Build-for-rLATEST
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: canvasXpress
-Version: 1.46.9-1
+Version: 1.50.5
 Title: Visualization Package for CanvasXpress in R
 Description: Enables creation of visualizations using the CanvasXpress framework
     in R. CanvasXpress is a standalone JavaScript library for reproducible research
@@ -25,7 +25,7 @@ Imports:
     httr,
     jsonlite,
     stats
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests:
     shiny (>= 1.1.0),
     canvasXpress.data,

diff --git a/NEWS.md b/NEWS.md
@@ -11,6 +11,11 @@ For detailed information on changes to the stand-alone JavaScript CanvasXpress l
 
 ---
 
+## v1.50.5
+* Updated CanvasXpress JS and CSS libraries to v50.5
+* Resolved noSuggests issues on CRAN
+
+
 ## v1.46.9-1
 * Updated tests per input by Carson for the htmlwidgets release 1.6.3
 

diff --git a/R/ggplot_as_list.R b/R/ggplot_as_list.R
@@ -197,7 +197,7 @@ gg_scales <- function (o) {
     for (i in 1:n) {
       s = o$scales$scales[[i]]
       if (s$aesthetics[1] == "colour" || s$aesthetics[1] == "fill") {
-        if (stringr::str_detect(s$scale_name, "gradient")) {
+        if (!is.null(s$scale_name) && stringr::str_detect(s$scale_name, "gradient")) {
           if (s$scale_name == "gradient2") {
             s$train(c(-1,1))
           } else {

diff --git a/R/html_functionality.R b/R/html_functionality.R
@@ -67,7 +67,7 @@ cxHtmlPage <- function(chartObject, width = NULL, height = NULL) {
                       "---",
                       "",
                       "```{r echo = FALSE}",
-                      paste0("htmltools::includeHTML('", tmp_widget, "')"),
+                      paste0("append_html_document('", tmp_widget, "')"),
                       "```")
 
         htmlwidgets::saveWidget(chartObject, tmp_widget)
@@ -95,3 +95,19 @@ cxHtmlPage <- function(chartObject, width = NULL, height = NULL) {
 
     result
 }
+
+
+#  Append passed html document (i.e CX plot) to downloadable report.
+#  Note, this function is used over htmlTools package includeHTML function to
+#  override its generated warning that can't be silenced and added to the report
+append_html_document <- function(html_file) {
+    # convert html document to html fragment before appending it to
+    # another html document to avoid any possible browser issue from duplicated html tags
+    lines <- readLines(html_file, warn = FALSE, encoding = "UTF-8")
+    lines <- paste(lines, collapse = "\n")
+    lines <- gsub(pattern     = "^<!DOCTYPE html>|<html*>|</html>$",
+                  replacement = "",
+                  ignore.case = TRUE,
+                  x           = lines)
+    shiny::HTML(lines)
+}
diff --git a/README.md b/README.md
diff --git a/cran-comments.md b/cran-comments.md
@@ -1,36 +1,36 @@
 ## Comments from Maintainer
 
-* patch fix for tests for the release of HTMLwidgets 1.6.3 by Carson next week
+- Update to underlying JS library (canvasXpress)
+- noSuggests issues resolved
 
-There is 1 note on the release because we put out a recent release but were just notified by Carson of this need in order to not end up with our package failing tests on CRAN.
-
-Version: I added -1 to the version because we intend to keep the underlying JS canvasXpress library in sync with the 2nd two components of the version of the package.  The package version reflects the JS library version so to make this patch we need to add a 4th component to the version.
+Note: there is a package that has been archived on CRAN that has a reverse dependency.  This is unable to be checked by revdepcheck as noted below, however is not something we can resolve on our end.  The package with the issue is MAFDash https://cran.r-project.org/package=MAFDash
 
 ---  
 
 ## Test environments
 
 
-RStudio Server Pro (ubuntu 18.04.2)  
+RStudio Server (ubuntu 20.04)  
 
-* R 4.0.5
-* R 4.2.3
-* R 4.3.1
+* R 4.3.3
 
 CircleCI
 
 * R 4.0.5
-* R 4.3.2
+* R 4.3.3
+* R Latest
 
 WinBuilder
 
 * devtools::check_win_devel()  
 * devtools::check_win_release()  
 
-RHub
 
-* devtools::check_rhub(interactive = F, 
-                       env_vars    = c(`_R_CHECK_FORCE_SUGGESTS_` = "false"))
+RHub (v2)
+
+rhub::rhub_check(branch    = "cran", 
+                 platforms = c("ubuntu-next", "ubuntu-release", "nosuggests",  # linux platforms
+                               "linux", "macos-arm64", "windows"))             # other platforms
 
 
 ---  
@@ -55,7 +55,7 @@ devtools::check()
 
 ```
 > revdepcheck::cran_revdeps('canvasXpress', bioc = T)
-[1] "canvasXpress"      "canvasXpress.data" "DGEobj.utils"      "MAFDash"           "periscope"         "periscope2"       
+[1] "dbparser"     "DGEobj.utils" "MAFDash"      "periscope"    "periscope2"  
 ```
 
 ```
@@ -65,6 +65,11 @@ devtools::check()
 We checked 5 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
 
  * We saw 0 new problems
- * We failed to check 0 packages
+ * We failed to check 1 packages
+
+Issues with CRAN packages are summarised below.
+
+### Failed to check
 
+* MAFDash (NA)
 ```
diff --git a/inst/htmlwidgets/canvasXpress.yaml b/inst/htmlwidgets/canvasXpress.yaml
@@ -1,6 +1,6 @@
 dependencies:
   - name: canvasXpress
-    version: 46.9
+    version: 50.5
     src: "htmlwidgets/lib/canvasXpress"
     script: canvasXpress.min.js
     stylesheet: canvasXpress.css