Displayr
diff --git a/Diff for: ‎.Rbuildignore
+1 b/Diff for: ‎.Rbuildignore
+1
diff --git a/Diff for: ‎.github/.gitignore
+1 b/Diff for: ‎.github/.gitignore
+1
diff --git a/Diff for: ‎.github/workflows/R-CMD-check.yaml
+143 b/Diff for: ‎.github/workflows/R-CMD-check.yaml
+143
diff --git a/Diff for: ‎.gitignore
-1 b/Diff for: ‎.gitignore
-1
diff --git a/Diff for: ‎DESCRIPTION
+9-10 b/Diff for: ‎DESCRIPTION
+9-10
diff --git a/Diff for: ‎NAMESPACE
+8 b/Diff for: ‎NAMESPACE
+8
@@ -20,3 +20,4 @@ revdep/
 README.Rmd
 abbvie.R
 ^\.httr-oauth$
+^\.github$
@@ -0,0 +1 @@
+*.html
@@ -0,0 +1,143 @@
+# NOTE: This workflow is overkill for most R packages
+# check-standard.yaml is likely a better choice
+# usethis::use_github_action("check-standard") will install it.
+#
+# For help debugging build failures open an issue on the RStudio community with the 'github-actions' tag.
+# https://community.rstudio.com/new-topic?category=Package%20development&tags=github-actions
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+    branches:
+      - main
+      - master
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macOS-latest,   r: 'release', visual_tests: true, node: "14.x", shinytest: true}
+          - {os: windows-latest, r: 'release'}
+          #- {os: windows-latest, r: '3.6', rspm: "https://packagemanager.rstudio.com/cran/latest"}
+          - {os: ubuntu-18.04,   r: 'devel', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.1.0 (ubuntu-18.04) R (4.1.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
+          # vdiffr & shinytest only runs on linux r-release since the results aren't cross-platform
+          - {os: ubuntu-18.04,   r: 'release', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
+          - {os: ubuntu-18.04,   r: 'oldrel',  rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
+          - {os: ubuntu-18.04,   r: '3.6',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
+          - {os: ubuntu-18.04,   r: '3.5',     rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest"}
+
+    env:
+      RSPM: ${{ matrix.config.rspm }}
+      VISUAL_TESTS: ${{ matrix.config.visual_tests }}
+      SHINYTEST: ${{ matrix.config.shinytest }}
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      MAPBOX_TOKEN: ${{ secrets.MAPBOX_TOKEN }}
+      plotly_username: ${{ secrets.PLOTLY_USERNAME }}
+      plotly_api_key: ${{ secrets.PLOTLY_API_KEY }}
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-r@v1
+        id: install-r
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+
+      - uses: r-lib/actions/setup-pandoc@v1
+
+      - name: Install pak and query dependencies
+        run: |
+          install.packages("pak", repos = "https://r-lib.github.io/p/pak/dev/")
+          saveRDS(pak::pkg_deps("local::.", dependencies = TRUE), ".github/r-depends.rds")
+        shell: Rscript {0}
+
+      - name: Restore R package cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            ${{ env.R_LIBS_USER }}/*
+            !${{ env.R_LIBS_USER }}/pak
+          key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }}
+          restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-
+
+      - name: Install Linux sysdeps
+        if: runner.os == 'Linux'
+        run: |
+          pak::local_system_requirements(execute = TRUE)
+          pak::pkg_system_requirements("rcmdcheck", execute = TRUE)
+        shell: Rscript {0}
+        
+      - name: Install dependencies
+        run: |
+          if (Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'mac.binary')
+          pak::local_install_dev_deps(upgrade = FALSE)
+          pak::pkg_install("rcmdcheck")
+        shell: Rscript {0}
+        
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      
+      - name: Install kaleido
+        if: matrix.config.visual_tests == true
+        run: |
+          sudo chown -R $UID $CONDA # https://github.com/nextstrain/conda/issues/5
+          Rscript -e "reticulate::install_miniconda()"
+          Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')"
+          Rscript -e "reticulate::conda_install('r-reticulate', 'plotly', channel = 'plotly')"
+          Rscript -e "reticulate::use_miniconda('r-reticulate')"
+        
+      - name: Install shinytest deps
+        if: matrix.config.shinytest == true
+        run: |
+          Rscript -e 'shinytest::installDependencies()'
+          R CMD install .
+        shell: bash
+        
+        # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests
+      - name: Run Tests
+        run: |
+          options(crayon.enabled = TRUE, testthat.progress.max_fails=1000)
+          if (!require(devtools)) pak::pak("devtools")
+          if (!require(reshape2)) pak::pak("reshape2")
+          res <- devtools::test()
+          df <- as.data.frame(res)
+          if (sum(df$failed) > 0 || any(df$error)) stop("GHA CI tests failed")
+        shell: Rscript {0}
+        
+      # Upload the whole pkg since tests where run with devtools::test()
+      - name: Upload check results
+        if: always()
+        uses: actions/upload-artifact@master
+        with:
+          name: ${{ runner.os }}-r${{ matrix.config.r }}-results
+          path: ./
+
+      # Run check with --no-tests since we ran them abve
+      - name: Check
+        run: |
+          options(crayon.enabled = TRUE)
+          rcmdcheck::rcmdcheck(args = c("--no-tests", "--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
+        shell: Rscript {0}
+
+      #- name: Show testthat output
+      #  if: always()
+      #  run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
+      #  shell: bash
+
+      - name: Don't use tar from old Rtools to store the cache
+        if: ${{ runner.os == 'Windows' && startsWith(steps.install-r.outputs.installed-r-version, '3.6' ) }}
+        shell: bash
+        run: echo "C:/Program Files/Git/usr/bin" >> $GITHUB_PATH
@@ -18,4 +18,3 @@ revdep/
 travis_debug.R
 .httr-oauth
 tests/testthat/Rplots.pdf
-inst/examples/shiny/event_data/tests/shinytest/mytest-current/
@@ -1,6 +1,6 @@
 Package: plotly
 Title: Create Interactive Web Graphics via 'plotly.js'
-Version: 4.9.4.3
+Version: 4.10.0.9001
 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     email = "[email protected]", comment = c(ORCID = "0000-0002-4958-2844")),
     person("Chris", "Parmer", role = "aut",
@@ -20,8 +20,8 @@ Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
     person("Plotly Technologies Inc.", role = "cph"))
 License: MIT + file LICENSE
 Description: Create interactive web graphics from 'ggplot2' graphs and/or a custom interface to the (MIT-licensed) JavaScript library 'plotly.js' inspired by the grammar of graphics.
-URL: https://plotly-r.com, https://github.com/ropensci/plotly#readme, https://plotly.com/r/
-BugReports: https://github.com/ropensci/plotly/issues
+URL: https://plotly-r.com, https://github.com/plotly/plotly.R, https://plotly.com/r/
+BugReports: https://github.com/plotly/plotly.R/issues
 Depends:
     R (>= 3.2.0),
     ggplot2 (>= 3.0.0)
@@ -36,7 +36,7 @@ Imports:
     base64enc,
     htmltools (>= 0.3.6),
     htmlwidgets (>= 1.5.2.9001),
-    tidyr,
+    tidyr (>= 1.0.0),
     RColorBrewer,
     dplyr,
     vctrs,
@@ -53,32 +53,31 @@ Suggests:
     hexbin,
     ggthemes,
     GGally,
+    ggalluvial,
     testthat,
     knitr,
     devtools,
     shiny (>= 1.1.0),
     shinytest (>= 1.3.0),
     curl,
     rmarkdown,
-    vdiffr,
     Cairo,
     broom,
     webshot,
     listviewer,
     dendextend,
-    sf,
     maptools,
     rgeos,
+    sf,
     png,
     IRdisplay,
     processx,
     plotlyGeoAssets,
     forcats,
-    palmerpenguins
+    palmerpenguins,
+    rversions,
+    reticulate
 LazyData: true
 RoxygenNote: 7.1.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
-Remotes: 
-  rstudio/thematic,
-  Displayr/htmlwidgets
@@ -34,8 +34,10 @@ S3method(print,api)
 S3method(print,api_grid)
 S3method(print,api_grid_local)
 S3method(print,api_plot)
+S3method(print,kaleidoScope)
 S3method(print,plotly_data)
 S3method(to_basic,GeomAbline)
+S3method(to_basic,GeomAlluvium)
 S3method(to_basic,GeomAnnotationMap)
 S3method(to_basic,GeomArea)
 S3method(to_basic,GeomBoxplot)
@@ -47,6 +49,7 @@ S3method(to_basic,GeomDensity2d)
 S3method(to_basic,GeomDotplot)
 S3method(to_basic,GeomErrorbar)
 S3method(to_basic,GeomErrorbarh)
+S3method(to_basic,GeomFunction)
 S3method(to_basic,GeomHex)
 S3method(to_basic,GeomHline)
 S3method(to_basic,GeomJitter)
@@ -65,6 +68,7 @@ S3method(to_basic,GeomSf)
 S3method(to_basic,GeomSmooth)
 S3method(to_basic,GeomSpoke)
 S3method(to_basic,GeomStep)
+S3method(to_basic,GeomStratum)
 S3method(to_basic,GeomTile)
 S3method(to_basic,GeomViolin)
 S3method(to_basic,GeomVline)
@@ -136,6 +140,7 @@ export(hide_guides)
 export(hide_legend)
 export(highlight)
 export(highlight_key)
+export(kaleido)
 export(knit_print.api_grid)
 export(knit_print.api_grid_local)
 export(knit_print.api_plot)
@@ -168,6 +173,7 @@ export(remove_typedarray_polyfill)
 export(rename)
 export(rename_)
 export(renderPlotly)
+export(save_image)
 export(schema)
 export(select)
 export(select_)
@@ -251,6 +257,7 @@ importFrom(purrr,transpose)
 importFrom(rlang,"!!!")
 importFrom(rlang,"!!")
 importFrom(rlang,eval_tidy)
+importFrom(rlang,is_na)
 importFrom(stats,complete.cases)
 importFrom(stats,is.leaf)
 importFrom(stats,quantile)
@@ -260,6 +267,7 @@ importFrom(tidyr,unnest)
 importFrom(tools,file_ext)
 importFrom(tools,file_path_sans_ext)
 importFrom(utils,browseURL)
+importFrom(utils,capture.output)
 importFrom(utils,data)
 importFrom(utils,file.edit)
 importFrom(utils,getFromNamespace)