Skip to content

Commit 910c58e

Browse files
committed
Merge branch 'master' into fix-colorscale
2 parents 0c77f46 + 741ce17 commit 910c58e

File tree

4 files changed

+14
-6
lines changed

4 files changed

+14
-6
lines changed

.github/ISSUE_TEMPLATE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
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>.
22

3-
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.
3+
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.
44

55
Delete these instructions once you have read them.
66

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ env:
1616
- secure: "WsvmMHN4YVhnk0bLRE04APcLbs5s4vWKSHjEdU0bPXd0xdMTzZeP5D7pxyF1983C+P5LpSnGHv4dgwLMBkNzxJwBR7/Ta7lfO1akYILWwxib+1DVbCqUH5Z4Ba1FSCQptIrLNGR3P7+0Lem4hEhqKdPKltFnxhnXO0Y+MeG71IQ="
1717
# MAPBOX_TOKEN (for testing `plot_mapbox()`)
1818
- secure: "QPBEqtLRdwb4ablJORzD0JdCT9ESe3nNdIehM1oxfcNKfpSdf2OFxH3TkeYY1nMpv0mLxiMNTy6xcj9Yk5MaaBCIA0P7q6OdZv9ruzQD1j3g84gP45KwBilbPGjb+/EvOS0fM25vR/pAmA8IyoUfPC2J8HwiNnW8DYdt/hJOJ9A="
19+
# GITHUB_PAT
20+
- secure: "lZf7GBt1+ogux5WAXmIZ6/VBTmR1G7rv+8Aevogfan7GWb32K3IVatsrKr1pSvz0hysP0MDueQqTv0GcNOvrFnYvobyo6fFpx+n33WkXQCGybUOHyfJpPdw1L2wtAy88ugNJDl+n9fdXr4yL2cWvRqq4WBKeeSi6hpdiKOaoB3Y="
1921

2022
before_install:
2123
- echo "Sys.setenv('plotly_username' = 'cpsievert')" > ~/.Rprofile
@@ -27,7 +29,7 @@ before_install:
2729
- Rscript -e 'update.packages(ask = FALSE)'
2830

2931
before_script:
30-
- 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
32+
- 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
3133

3234
# work around temporary travis + R 3.5 bug
3335
r_packages: devtools

inst/docker/Dockerfile.vtest

+9-3
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,18 @@ RUN R -e "devtools::install_github('brodieG/diffobj@development')"
9393
ENV VDIFFR=true
9494
EXPOSE 3838
9595

96+
# installing rgeos from CRAN is currently broken
97+
# http://r-sig-geo.2731867.n2.nabble.com/Re-Unexpected-configure-error-following-recent-rgeos-release-td7592423.html
98+
RUN R -e "install.packages('rgeos', repos='http://R-Forge.R-project.org', type='source')"
99+
100+
RUN R -e "update.packages(ask=FALSE)"
101+
96102
# install any new dependencies, then either manage cases (the default) or run tests
97103
# note the workaround to get docker to run a proper exit status when there are testthat errors
98104
# https://github.com/r-lib/testthat/issues/515#issuecomment-304169376
99105

100-
ENTRYPOINT R -e "devtools::install_deps('/home/plotly', dep = T); \
101-
if (!identical(Sys.getenv('VMODE'), 'ci')) vdiffr::manage_cases('/home/plotly'); \
102-
res <- devtools::test('/home/plotly', reporter='summary'); \
106+
CMD cd /home/plotly && R -e "devtools::install_deps(dep = T); \
107+
if (!identical(Sys.getenv('VMODE'), 'ci')) vdiffr::manage_cases(); \
108+
res <- devtools::test(reporter='summary'); \
103109
df <- as.data.frame(res); \
104110
if (sum(df\$failed) > 0 || any(df\$error)) q(status=1)"

tests/testthat/helper-vdiffr.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ message("Visual testing is ", if (!enable_vdiffr) "not ", "enabled.")
77
if (enable_vdiffr) {
88

99
# try 20 random ports
10-
for (i in 1:20) {
10+
for (vdiff_port_tries in 1:20) {
1111
port <- floor(runif(1, 3001, 8000))
1212
success <- tryFALSE({
1313
# init image server with webgl enabled

0 commit comments

Comments
 (0)