Merge branch 'master' into dplyr-groups

Author: cpsievert

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 Please briefly describe your problem and what output you expect. If you have a question, please don't use this form, but instead ask on the community forum <http://community.plot.ly/c/api/r> or stackoverflow <http://stackoverflow.com>.
 
-Please include a minimal reprex. The goal of a reprex is to make it as easy as possible for me to recreate your problem so that I can fix it. If you've never heard of a reprex before, start by reading <https://github.com/jennybc/reprex#what-is-a-reprex>, and follow the advice further down the page. Do NOT include session info unless it's explicitly asked for, or you've used `reprex::reprex(..., si = TRUE)` to hide it away.  
+Please include a minimal reprex. The goal of a reprex is to make it as easy as possible for me to recreate your problem so that I can fix it. If you've never heard of a reprex before, start by reading <https://github.com/tidyverse/reprex#readme>, and follow the advice further down the page. Do NOT include session info unless it's explicitly asked for, or you've used `reprex::reprex(..., si = TRUE)` to hide it away.  
 
 Delete these instructions once you have read them.
 

.travis.yml

@@ -16,6 +16,8 @@ env:
     - secure: "WsvmMHN4YVhnk0bLRE04APcLbs5s4vWKSHjEdU0bPXd0xdMTzZeP5D7pxyF1983C+P5LpSnGHv4dgwLMBkNzxJwBR7/Ta7lfO1akYILWwxib+1DVbCqUH5Z4Ba1FSCQptIrLNGR3P7+0Lem4hEhqKdPKltFnxhnXO0Y+MeG71IQ="
     # MAPBOX_TOKEN (for testing `plot_mapbox()`)
     - secure: "QPBEqtLRdwb4ablJORzD0JdCT9ESe3nNdIehM1oxfcNKfpSdf2OFxH3TkeYY1nMpv0mLxiMNTy6xcj9Yk5MaaBCIA0P7q6OdZv9ruzQD1j3g84gP45KwBilbPGjb+/EvOS0fM25vR/pAmA8IyoUfPC2J8HwiNnW8DYdt/hJOJ9A="
+    # GITHUB_PAT
+    - secure: "lZf7GBt1+ogux5WAXmIZ6/VBTmR1G7rv+8Aevogfan7GWb32K3IVatsrKr1pSvz0hysP0MDueQqTv0GcNOvrFnYvobyo6fFpx+n33WkXQCGybUOHyfJpPdw1L2wtAy88ugNJDl+n9fdXr4yL2cWvRqq4WBKeeSi6hpdiKOaoB3Y="
 
 before_install:
   - echo "Sys.setenv('plotly_username' = 'cpsievert')" > ~/.Rprofile
@@ -27,7 +29,7 @@ before_install:
   - Rscript -e 'update.packages(ask = FALSE)'
 
 before_script:
-  - if [[ "$TRAVIS_R_VERSION_STRING" == "release" ]]; then docker run -e MAPBOX_TOKEN=$MAPBOX_TOKEN -e VMODE="ci" -v $(pwd):/home/plotly --privileged cpsievert/plotly-orca; fi
+  - if [[ "$TRAVIS_R_VERSION_STRING" == "release" ]]; then docker run -e GITHUB_PAT=$GITHUB_PAT -e MAPBOX_TOKEN=$MAPBOX_TOKEN -e VMODE="ci" -v $(pwd):/home/plotly --privileged cpsievert/plotly-orca; fi
 
 # work around temporary travis + R 3.5 bug
 r_packages: devtools  

inst/docker/Dockerfile.vtest

@@ -93,12 +93,18 @@ RUN R -e "devtools::install_github('brodieG/diffobj@development')"
 ENV VDIFFR=true
 EXPOSE 3838
 
+# installing rgeos from CRAN is currently broken
+# http://r-sig-geo.2731867.n2.nabble.com/Re-Unexpected-configure-error-following-recent-rgeos-release-td7592423.html
+RUN R -e "install.packages('rgeos', repos='http://R-Forge.R-project.org', type='source')"
+
+RUN R -e "update.packages(ask=FALSE)"
+
 # install any new dependencies, then either manage cases (the default) or run tests
 # note the workaround to get docker to run a proper exit status when there are testthat errors
 # https://github.com/r-lib/testthat/issues/515#issuecomment-304169376
 
-ENTRYPOINT R -e "devtools::install_deps('/home/plotly', dep = T); \
-  if (!identical(Sys.getenv('VMODE'), 'ci')) vdiffr::manage_cases('/home/plotly'); \
-  res <- devtools::test('/home/plotly', reporter='summary'); \
+CMD cd /home/plotly && R -e "devtools::install_deps(dep = T); \
+  if (!identical(Sys.getenv('VMODE'), 'ci')) vdiffr::manage_cases(); \
+  res <- devtools::test(reporter='summary'); \
   df <- as.data.frame(res); \
   if (sum(df\$failed) > 0 || any(df\$error)) q(status=1)"

inst/htmlwidgets/plotly.js

@@ -305,39 +305,6 @@ HTMLWidgets.widget({
       });
     } 
 
-    
-    // send user input event data to dashR
-    // TODO: make this more consistent with Graph() props?
-    var dashRwidgets = window.dashRwidgets || {};
-    var dashRmode = typeof el.setProps === "function" &&
-                    typeof dashRwidgets.htmlwidget === "function";
-    if (dashRmode) {
-      graphDiv.on('plotly_relayout', function(d) {
-        el.setProps({"input_plotly_relayout": d});
-      });
-      graphDiv.on('plotly_hover', function(d) {
-        el.setProps({"input_plotly_hover": eventDataWithKey(d)});
-      });
-      graphDiv.on('plotly_click', function(d) {
-        el.setProps({"input_plotly_click": eventDataWithKey(d)});
-      });
-      graphDiv.on('plotly_selected', function(d) {
-        el.setProps({"input_plotly_selected": eventDataWithKey(d)});
-      });
-      graphDiv.on('plotly_unhover', function(eventData) {
-        el.setProps({"input_plotly_hover": null});
-      });
-      graphDiv.on('plotly_doubleclick', function(eventData) {
-        el.setProps({"input_plotly_click": null});
-      });
-      // 'plotly_deselect' is code for doubleclick when in select mode
-      graphDiv.on('plotly_deselect', function(eventData) {
-        el.setProps({"input_plotly_selected": null});
-        el.setProps({"input_plotly_click": null});
-      });
-    } 
-    
-    
     // Given an array of {curveNumber: x, pointNumber: y} objects,
     // return a hash of {
     //   set1: {value: [key1, key2, ...], _isSimpleKey: false}, 

tests/testthat/helper-vdiffr.R

@@ -7,7 +7,7 @@ message("Visual testing is ", if (!enable_vdiffr) "not ", "enabled.")
 if (enable_vdiffr) {
 
   # try 20 random ports
-  for (i in 1:20) {
+  for (vdiff_port_tries in 1:20) {
     port <- floor(runif(1, 3001, 8000))
     success <- tryFALSE({
       # init image server with webgl enabled