Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Plotly june2022 #18

Merged
merged 62 commits into from
Jul 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
9fe33eb
Start v4.9.4 release candidate (#1959)
cpsievert Jun 8, 2021
771d584
Add crosstalk mapping to computed_mapping (not mapping) when present …
cpsievert Jun 17, 2021
bb98fef
v4.9.4.1 release candidate (#1965)
cpsievert Jun 21, 2021
6f3e1f8
use dev version
cpsievert Jun 21, 2021
e2afc47
Upgrade to plotly.js 2.0 (#1967)
cpsievert Jun 22, 2021
1093705
Update subplots.R (#1974)
abhilashlakshman Jul 14, 2021
bdfdc4b
Better positioning of facet axis annotations (#1975)
cpsievert Jul 14, 2021
278b670
Add kaleido() for static image exporting (#1971)
cpsievert Jul 14, 2021
079ac68
Close #1970: revert plotly.js 2.0 change in default modebar buttons
cpsievert Jul 14, 2021
2e389a6
Add save_image(), a convenience wrapper around kaleido()$transform() …
cpsievert Jul 18, 2021
a938bf5
Upgrade to plotly.js v2.2.1 (#1982)
cpsievert Jul 18, 2021
5b83c64
Use Plotly.react() to redraw in Shiny if layout.transition is populat…
cpsievert Sep 20, 2021
6186822
Update to plotly.js v2.5.1 (#2002)
cpsievert Sep 21, 2021
f58d4ba
Closes #2031. ggplot internaly convert `color` to `colour`
moutikabdessabour Sep 28, 2021
cdac45f
Update README.md
jackparmer Oct 1, 2021
eb96bc2
update baselines
cpsievert Oct 8, 2021
1889ca6
update URLs
cpsievert Oct 8, 2021
c35a44e
add_area() now uses barpolar instead of area (#2041)
cpsievert Oct 8, 2021
6dae230
Closes #1872. Implemented to_basic for `geom_function`
moutikabdessabour Oct 8, 2021
b137432
4.10.0 release
cpsievert Oct 8, 2021
a628137
Added unit tests. And ran tests using
moutikabdessabour Oct 8, 2021
1a02fe9
Conformed with carson's review
moutikabdessabour Oct 9, 2021
c89d84f
Reverted the deletion of _snaps
moutikabdessabour Oct 9, 2021
6e1f979
Added test to check whether the fix works or not.
moutikabdessabour Oct 9, 2021
9bddfc2
Added test to check whether the fix works or not.
moutikabdessabour Oct 9, 2021
94fa7da
Merge pull request #2034 from moutikabdessabour/ggplotly_color_aes_fix
moutikabdessabour Oct 14, 2021
e3043ae
Merge pull request #2042 from moutikabdessabour/implement_geomFunction
moutikabdessabour Oct 14, 2021
2ef4a3f
use dev versioning
cpsievert Oct 14, 2021
4d957ab
Fix "partial argument match" warnings (#1977)
bersbersbers Oct 13, 2021
4f66dc3
No partial-argument-match warning in ggplotly
bersbersbers Oct 13, 2021
dfdb6ff
Update NEWS.md
bersbersbers Oct 15, 2021
4bb1e44
Merge pull request #2046 from bersbersbers/partial-argument-match-war…
moutikabdessabour Oct 18, 2021
aeaecd6
Solved the LaTeX2exp error. Closes #2027 (#2030)
moutikabdessabour Nov 1, 2021
15807cf
Revert "Solved the LaTeX2exp error. Closes #2027 (#2030)"
cpsievert Nov 1, 2021
35f9039
Add ggalluvial support (#2061)
cpsievert Nov 2, 2021
aa9dcb7
Fix ordering of lines in stat_ecdf() (#2065)
cpsievert Nov 2, 2021
df35a7d
Handle geom_tile() with no fill aesthetic (#2063)
cpsievert Nov 2, 2021
49215db
More careful joining of group columns (#2064)
cpsievert Nov 2, 2021
555a443
Avoid with() to better account for missing tickvals/ticktext (#2062)
cpsievert Nov 2, 2021
58bf7b7
Test discrete-ness of fill after statistics have been calculated (#2066)
cpsievert Nov 2, 2021
50acd97
Announce snapshot files when visual testing isn't enabled so they won…
cpsievert Nov 2, 2021
4642714
Respect guide(aes = 'none') when constructing legend entries (#2067)
cpsievert Nov 2, 2021
3d49fbc
Add 'plotly_selecting' to acceptable 'on' events (#1280)
cpsievert Nov 2, 2021
e6cc271
Use faster versions of system.file()/packageVersion()/is_installed() …
cpsievert Nov 17, 2021
3c3d749
Bump plotly.js to 2.11.1 (#2096)
cpsievert Mar 26, 2022
1d11db5
approve new visual baselines
cpsievert Mar 26, 2022
0661fb2
Use rlang::local_options() in test
cpsievert Mar 26, 2022
2a19776
new shinytest baselines; avoid rlang altogether
cpsievert Mar 26, 2022
01582b8
plotly.js fix bug when crosstalk filter keys are null (#2087)
casperhart Apr 24, 2022
a4ed547
transition `tidyr::gather_` -> `tidyr::pivot_longer` (#2125)
simonpcouch Apr 27, 2022
5583518
Replace `is.na` with `rlang::is_na` in `map_color()` (#2131)
mojaveazure May 4, 2022
a4b1581
roxygenize
cpsievert May 4, 2022
a774c59
Support renderValue within iframe
Dec 12, 2018
6e0fbc3
Add yaml for auto-P.R./fork updating; RS-2202
Nov 21, 2019
504c33f
[pull] master from ropensci:master (#2)
pull[bot] Mar 12, 2020
719eaac
Add back missing layout attribute
chschan May 27, 2021
b749dfe
Pass element instead of ID
JustinCCYap Sep 7, 2021
98dd88e
VIS-992: add test, use rhtmlBuildUtils (#15)
JustinCCYap Sep 9, 2021
ed95dc7
VIS-933: add rhtmlwidget-status attribute (#16)
JustinCCYap Oct 6, 2021
484db06
VIS-1064: fix PPT exporting issue (#17)
JustinCCYap Mar 24, 2022
e6bc2a8
Merge branch 'master' into plotly-june2022
chschan Jun 28, 2022
ab905f3
Update widgetdefinition.js and build
JustinCCYap Jun 28, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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