Skip to content

Commit

Permalink
Plotly june2022 (#18)
Browse files Browse the repository at this point in the history
* Start v4.9.4 release candidate (plotly#1959)

* Add crosstalk mapping to computed_mapping (not mapping) when present (plotly#1964)

* Follow up to plotly#1952: add crosstalk mapping to computed_mapping (not mapping) when present

* use dev version; update news

* v4.9.4.1 release candidate (plotly#1965)

* v4.9.4.1 release candidate

* Reduce some of the warning noise

* Reduce some of the warning noise

* use dev version

* Upgrade to plotly.js 2.0 (plotly#1967)

* wip upgrade to plotly.js 2.0

* patch plotly.js source to support phantomjs/shinytest

reverts part of plotly/plotly.js#5380

* bump mathjax version

* use npm instead of yarn

* make geom_bar() default to textposition='none'; approve new vdiffr 0.4 + plotly.js 2.0 baselines

* Migrate to vdiffr 1.0

* Use layout.legend.title over layout.annotations to when converting guides for discrete scales

* wip migrate to gha

* try npm install

* setup node

* use recommended node version

* try mac instead

* install phantomjs; various cleanup

* intentionally break a visual test

* fix

* use thematic's approach to testing

* bump version

* regenerate snapshots

* map secrets to env variables

* accept new gha baselines

* whoops

* hmm

* approve shinytest baseline

* intentionally break a visual test

* always upload

* revert change; new baselines

* Remove the vdiffr dependency and use testthat snaphots directly

* More obvious env var naming

* more gha details

* always upload

* new snaps

* intentionally break a visual test (again)

* Revert "intentionally break a visual test (again)"

This reverts commit a4e306c.

* Update subplots.R (plotly#1974)

To get rid of "Error is get_domains(length(plots), nrows, margin, widths = widths, heights = heights): The sum of the widths and heights arguments must be less than 1.

* Better positioning of facet axis annotations (plotly#1975)

* Add kaleido() for static image exporting (plotly#1971)

* Close plotly#1970: revert plotly.js 2.0 change in default modebar buttons

* Add save_image(), a convenience wrapper around kaleido()$transform() (plotly#1981)

* Upgrade to plotly.js v2.2.1 (plotly#1982)

* Use Plotly.react() to redraw in Shiny if layout.transition is populated (plotly#2001)

* Use Plotly.react() to redraw in Shiny if layout.transition is populated

* update news

* Update to plotly.js v2.5.1 (plotly#2002)

* update to plotly.js v2.5.1

* new visual baselines

* Closes plotly#2031. ggplot internaly convert `color` to `colour`

* Update README.md

* update baselines

* update URLs

* add_area() now uses barpolar instead of area (plotly#2041)

* Closes plotly#1872. Implemented to_basic for `geom_function`

* 4.10.0 release

* Added unit tests. And ran tests using

* Conformed with carson's review

* Reverted the deletion of _snaps

* Added test to check whether the fix works or not.

* Added test to check whether the fix works or not.

* use dev versioning

* Fix "partial argument match" warnings (plotly#1977)

* No partial-argument-match warning in ggplotly

* Update NEWS.md

* Solved the LaTeX2exp error. Closes plotly#2027 (plotly#2030)

Co-authored-by: Carson Sievert <[email protected]>

* Revert "Solved the LaTeX2exp error. Closes plotly#2027 (plotly#2030)"

This reverts commit aeaecd6.

* Add ggalluvial support (plotly#2061)

Co-authored-by: Carson Sievert <[email protected]>
Co-authored-by: Abdessabour Moutik <[email protected]>

* Fix ordering of lines in stat_ecdf() (plotly#2065)

* Handle geom_tile() with no fill aesthetic (plotly#2063)

* More careful joining of group columns (plotly#2064)

* Avoid with() to better account for missing tickvals/ticktext (plotly#2062)

* Test discrete-ness of fill after statistics have been calculated (plotly#2066)

* Announce snapshot files when visual testing isn't enabled so they won't get deleted

* Respect guide(aes = 'none') when constructing legend entries (plotly#2067)

* Add 'plotly_selecting' to acceptable 'on' events (plotly#1280)

* Use faster versions of system.file()/packageVersion()/is_installed() (plotly#2072)

* Bump plotly.js to 2.11.1 (plotly#2096)

* approve new visual baselines

* Use rlang::local_options() in test

* new shinytest baselines; avoid rlang altogether

* plotly.js fix bug when crosstalk filter keys are null (plotly#2087)

* transition `tidyr::gather_` -> `tidyr::pivot_longer` (plotly#2125)

* transition `tidyr::gather_` -> `tidyr::pivot_longer`

* add `NEWS` entry

* Replace `is.na` with `rlang::is_na` in `map_color()` (plotly#2131)

* roxygenize

* Support renderValue within iframe

* Add yaml for auto-P.R./fork updating; RS-2202

* [pull] master from ropensci:master (#2)

* New version of scales no longer 'spans the gamut' of a qualitative color palette

* reduce Reduce() for merging lists

use do.call() instead to avoid quadratic complexity of growing lists

* ensure_one(): reduce noise if attrs are NULL

ignore NULL values

* ggplotly: fix Xaxis anchor if the last row incomplete

attach X axis to the last non-empty row in a column

* stylistic changes

* validate new visual baselines

* Doesn't seem like we need to handle yaxis being a factor

and if we do, it likely needs a different fix

* update shinytest baselines

* ugh maintaining shinytest tests for htmlwidgets is a real pain

* update sf baselines

* go back to using ggplotly() to prepare the widget for shiny rendering

* the extra call to plotly_build() forces more computation then necessary and fixes plotly#1569

* Generation of non-intercept data in hline/vline should respect coord_flip(), closes plotly#1519

* update news; fix typo

* Account for new changes in ggplot2's internal API, fixes plotly#1561

* Break values of positional scales have moved from  to
* Text labels of positional scales have moved from  to
* sf graticule degree labels are now quoted?

* include braces

* gsub

* moar braces

* new sf baselines

* update news

* upgrade to plotly.js v1.49.0

* upgrade to plotly.js v1.49.2

* upgrade to plotly.js v1.49.4

* update baseline

* update shinytest baseline

* make a deep copy of x.layout.width/x.layout.height for use in the resize method, closes plotly#1553

* Wrap user-supplied expression in evalq(), closes plotly#1528

* Use shiny::installExprFunction to register debug hooks

* Asynchronously register plot events

* Revert "Merge pull request plotly#1539 from ropensci/renderWidgetPrep"

This reverts commit d416cea, reversing
changes made to d11bb5a.

* no need to be making deep copies

* Improvements to algorithm for attaching key attribute for shiny's event data, fixes plotly#1610

* Account for pointNumbers
* Do nothing if we don't recognize the case

* When pointNumber is a constant, relay it as such

* handle the 3 cases separately

* use idx instead of i

* update news

* Call setInputValue only if it's defined, closes plotly#1624

* Revert "Revert "Merge pull request plotly#1539 from ropensci/renderWidgetPrep""

This reverts commit 2856731.

* pass along a quoted expr that calls func()

* Revert "go back to using ggplotly() to prepare the widget for shiny rendering"

This reverts commit a0fa68f.

* update news

* verify_webgl() shouldn't warn about types that are already gl, closes plotly#1569

* fix test

* Do not create structure with NULL to remove warnings

* Fix management of environments in renderPlotly(), fixes plotly#1639

Both assignment and evaluation of func() should happen in the local environment

* Add test to prove plotly#1299 fix

* proposed change to avoid peeking at 'grid' unit internals

* improve previous commit

* refactor Paul's unit type commits from plotly#1646

* Some CRAN builds don't have pandoc

* plot_mapbox() shouldn't force a scattermapbox trace type, closes plotly#1608

* fix R CMD check notes

* r-devel apparently doesn't yet have grid::unitType()

* remove outdated travis config

* Validate changes visual baselines due to changes in R3.6's new RNG method

* Add support for new plotly_sunburstclick event, closes plotly#1648

* validate new shinytest baselines

* update news

* fix silly mistake from 3cbccfc

* document

* test expectation should account for changes in the default color palette on r-devel

* improve the aforementioned test example and add a visual test

* Ignore calculated aesthetics that match specified aesthestics

After tidyverse/ggplot2@10fa0014, it's possible for calculated aes to exist for all default_aes

* fix broken link raster2uri and improve the description

* cran hyperlinks must be https

* fix roxygen warning

* In contrast to attr(x, unit), the new grid::unitType() function always return a vector the same length as it's input

* bump to release version; submit to CRAN

* Respect sf's plot12 graticule attribute when building axis ticks, fixes plotly#1673

* Remove missing values in ticktext/tickvals

As discussed in tidyverse/ggplot2#3566 (comment), it's now possible for the ggplot2 labels/positions to contains missing values, and we should be able to simply ignore them

* link to comment

* remove outdated/bad test expectation...the visual baseline covers it

* Don't assume sf geometry is always accessible via [['geometry']], fixes plotly#1659

* validate baselines

* update news

* update to plotly.js 1.52.2

* new baselines

* Add image and treemap visual tests. Also, ensure treemap's stroke reflects the paper's bgcolor

* Add Object.setPrototypeOf polyfill for shinytest and update shinytest json baseline

* Add add_image() for easier rendering of image traces via raster objects

* Bump version, update news, document, add unit test for add_image()

* roxygen escapes % now

* Only call locale_dependency() for locales not included with standard bundle, closes plotly#1686

* CRAN submission

* plot_mapbox() should default to scattermapbox unless z is present, fixes plotly#1707

* add visual test for plotly#1674

* update poor test expectations that assume stringsAsFactors defaults to TRUE

* bump version; update news

* update visual tests

* remove rnaturalearth dependency in tests

Co-authored-by: Carson Sievert <[email protected]>
Co-authored-by: Alexey Stukalov <[email protected]>
Co-authored-by: Wim <[email protected]>
Co-authored-by: Paul Murrell <[email protected]>

* Add back missing layout attribute

* Pass element instead of ID

* VIS-992: add test, use rhtmlBuildUtils (#15)

* Initial commit

* Remove prepush

* Final line for plotly.yml

* Re-add lib

* Refactor

* Create test

* Specify rhtmlBuildUtils version

* Remove preinstall script

* Delete package-lock.json

* Update documentation

* Update documentation and remove library

* Restore files

* Restore file

* Update build files

* VIS-933: add rhtmlwidget-status attribute (#16)

* Test callback

* Update compiled files

* Add rhtmlwidget-status attribute

* wording change

* VIS-1064: fix PPT exporting issue (#17)

* Candidate fix

* Bump version

* Update widgetdefinition.js and build

Co-authored-by: Carson Sievert <[email protected]>
Co-authored-by: Abhilash Lakshman <[email protected]>
Co-authored-by: Abdessabour Moutik <[email protected]>
Co-authored-by: Jack Parmer <[email protected]>
Co-authored-by: bersbersbers <[email protected]>
Co-authored-by: casperhart <[email protected]>
Co-authored-by: Simon P. Couch <[email protected]>
Co-authored-by: Paul Hoffman <[email protected]>
Co-authored-by: Jeffrey Shen <[email protected]>
Co-authored-by: flipDevTools <[email protected]>
Co-authored-by: pull[bot] <39814207+pull[bot]@users.noreply.github.com>
Co-authored-by: Alexey Stukalov <[email protected]>
Co-authored-by: Wim <[email protected]>
Co-authored-by: Paul Murrell <[email protected]>
Co-authored-by: Justin Yap <[email protected]>
  • Loading branch information
16 people authored Jul 4, 2022
1 parent 99fc3fc commit 55f49ee
Show file tree
Hide file tree
Showing 822 changed files with 1,722 additions and 1,056 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ revdep/
README.Rmd
abbvie.R
^\.httr-oauth$
^\.github$
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
143 changes: 143 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ revdep/
travis_debug.R
.httr-oauth
tests/testthat/Rplots.pdf
inst/examples/shiny/event_data/tests/shinytest/mytest-current/
19 changes: 9 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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)
Expand All @@ -36,7 +36,7 @@ Imports:
base64enc,
htmltools (>= 0.3.6),
htmlwidgets (>= 1.5.2.9001),
tidyr,
tidyr (>= 1.0.0),
RColorBrewer,
dplyr,
vctrs,
Expand All @@ -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
8 changes: 8 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -168,6 +173,7 @@ export(remove_typedarray_polyfill)
export(rename)
export(rename_)
export(renderPlotly)
export(save_image)
export(schema)
export(select)
export(select_)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
Loading

0 comments on commit 55f49ee

Please sign in to comment.