From 9bd02110c00c8dc5392380c9141a1760d1864d21 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 09:49:08 -0600 Subject: [PATCH 01/15] fix #373 --- R/trace_generation.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/trace_generation.R b/R/trace_generation.R index 5f868a6795..23326c5996 100644 --- a/R/trace_generation.R +++ b/R/trace_generation.R @@ -565,7 +565,7 @@ geom2trace <- list( # when converting ggplot2 size to plotly size, we assume size is an _area_, # but "size" for lines really means linewidth, so size is a _length_ in this case # (see aesConverters$size) - params$size <- sqrt(params$size) + params$size <- ifelse(params$size < 1, params$size ^ 2, sqrt(params$size)) list(x=data$x, y=data$y, name=params$name, From 2001e9b061d57f8daf34ca1c1d650929fc5e4604 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 10:26:20 -0600 Subject: [PATCH 02/15] use bleeding edge devtools --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index c0682b22b6..278e4327d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,8 +28,9 @@ before_script: - git clone https://github.com/cpsievert/plotly-test-table.git ../plotly-test-table - "wget -q -O - https://github.com/yihui/crandalf/raw/master/inst/scripts/install-pandoc | bash" - Rscript -e 'if (length(find.package("devtools", quiet = TRUE)) == 0L) { install.packages("devtools", repos = "http://cran.rstudio.com") }' - - Rscript -e 'library(devtools);update_packages("devtools", repos = "http://cran.rstudio.com")' - - Rscript -e 'library(devtools);install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' + - Rscript -e 'devtools::install_github("hadley/devtools")' + - Rscript -e 'devtools::update_packages("devtools", repos = "http://cran.rstudio.com")' + - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' script: # run R CMD check on the non-pull request build From 0ba12817d3f4c610094f4c1687615aee26b9994a Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 10:45:16 -0600 Subject: [PATCH 03/15] use R CMD install instead of devtools::install() --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 278e4327d7..78fe200f5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,7 +28,6 @@ before_script: - git clone https://github.com/cpsievert/plotly-test-table.git ../plotly-test-table - "wget -q -O - https://github.com/yihui/crandalf/raw/master/inst/scripts/install-pandoc | bash" - Rscript -e 'if (length(find.package("devtools", quiet = TRUE)) == 0L) { install.packages("devtools", repos = "http://cran.rstudio.com") }' - - Rscript -e 'devtools::install_github("hadley/devtools")' - Rscript -e 'devtools::update_packages("devtools", repos = "http://cran.rstudio.com")' - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' @@ -36,7 +35,8 @@ script: # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" # we do some fancy stuff on the pull request build that confuses R CMD check - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'devtools::install(); source(\"tests/testthat.R\", chdir = T)'; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ./; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"tests/testthat.R\", chdir = T)'; fi" after_success: - cd ../plotly-test-table From 3943aa42bb7a9e0c198d8ab81ed6081b9b2487ab Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 10:52:07 -0600 Subject: [PATCH 04/15] debugging --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 78fe200f5e..2cb97b6679 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,6 +35,7 @@ script: # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" # we do some fancy stuff on the pull request build that confuses R CMD check + - R CMD install --help - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ./; fi" - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"tests/testthat.R\", chdir = T)'; fi" From 7bc3977103f034e74040b5078c7844f10325beba Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 11:16:36 -0600 Subject: [PATCH 05/15] this is fun --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2cb97b6679..da336396d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,7 @@ script: # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" # we do some fancy stuff on the pull request build that confuses R CMD check - - R CMD install --help - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ./; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ../plotly ; fi" - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"tests/testthat.R\", chdir = T)'; fi" after_success: From bc6c7688bdca5abadd9a966c5822f55e60e44daa Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 11:27:01 -0600 Subject: [PATCH 06/15] ugh --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da336396d6..c51493a3d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ script: # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" # we do some fancy stuff on the pull request build that confuses R CMD check - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ../plotly ; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ../plotly/ ; fi" - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"tests/testthat.R\", chdir = T)'; fi" after_success: From b3d879aec5e1e6710f7b0b60116ff0247f4ff233 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 11:33:55 -0600 Subject: [PATCH 07/15] do we even need to install? --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c51493a3d3..ffd8111ab1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,10 @@ before_script: - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' script: + - Rscript -e "library(plotly); devtools::session_info()" # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" # we do some fancy stuff on the pull request build that confuses R CMD check - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then R CMD install ../plotly/ ; fi" - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"tests/testthat.R\", chdir = T)'; fi" after_success: From 1f5fe5762bee0b209dee6402bb2e27c2f42bc5c9 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 12:03:37 -0600 Subject: [PATCH 08/15] yes, install is needed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ffd8111ab1..cca3bcf698 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,9 @@ before_script: - Rscript -e 'if (length(find.package("devtools", quiet = TRUE)) == 0L) { install.packages("devtools", repos = "http://cran.rstudio.com") }' - Rscript -e 'devtools::update_packages("devtools", repos = "http://cran.rstudio.com")' - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' + - cd ..; R CMD install plotly script: - - Rscript -e "library(plotly); devtools::session_info()" # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" # we do some fancy stuff on the pull request build that confuses R CMD check From 2b09bf16d73f2b7b96ea7500a1655adae2e58093 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 12:21:06 -0600 Subject: [PATCH 09/15] borrow some tricks from rmarkdown --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cca3bcf698..5318105ffd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,7 @@ addons: env: global: - - R_LIBS_USER=~/R/library NOT_CRAN=true + - R_LIBS_USER=~/R/library NOT_CRAN=true R_PKG="$(basename $TRAVIS_REPO_SLUG)" # plotly_api_key (for posting to plot.ly) - secure: "jlIAFoBGaDWUQDh6oGNb2BgU31/80iioM4y4xwx35yWkGKkNIID1eMEuiIn+/ipLvOVHkPTDS6DYnOtD8EIBpROgAKHFY33gM1h7P6NRxVszzC6WLP2ASnq95DWq36DAC2Oevy05V7nwSRFilPwSt6JLppYUInG+WdaZ+QOSRi4=" # GITHUB_PAT (for pushing to plotly-test-table) @@ -30,7 +30,7 @@ before_script: - Rscript -e 'if (length(find.package("devtools", quiet = TRUE)) == 0L) { install.packages("devtools", repos = "http://cran.rstudio.com") }' - Rscript -e 'devtools::update_packages("devtools", repos = "http://cran.rstudio.com")' - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' - - cd ..; R CMD install plotly + - cd ..; R CMD INSTALL $R_PKG script: # run R CMD check on the non-pull request build From 4747a61b385e1f043238667c23d3bf6765cd71fa Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 12:22:54 -0600 Subject: [PATCH 10/15] more tricks --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5318105ffd..3edf37b703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,8 @@ before_script: - Rscript -e 'if (length(find.package("devtools", quiet = TRUE)) == 0L) { install.packages("devtools", repos = "http://cran.rstudio.com") }' - Rscript -e 'devtools::update_packages("devtools", repos = "http://cran.rstudio.com")' - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' - - cd ..; R CMD INSTALL $R_PKG + - cd ..; rm -f *.tar.gz; R CMD build $R_PKG + - R CMD INSTALL ${R_PKG}_*.tar.gz script: # run R CMD check on the non-pull request build From 2fbc1a1e7b034e0976146bc7b32edab2a2562589 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 12:35:54 -0600 Subject: [PATCH 11/15] set working dir --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3edf37b703..9dfffa8599 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,6 +32,7 @@ before_script: - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' - cd ..; rm -f *.tar.gz; R CMD build $R_PKG - R CMD INSTALL ${R_PKG}_*.tar.gz + - cd plotly script: # run R CMD check on the non-pull request build From 9bb3f771883558e88b15b4db2fd9e7667b6412ae Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 12:53:30 -0600 Subject: [PATCH 12/15] bump version; update news --- .travis.yml | 2 ++ DESCRIPTION | 2 +- NEWS | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9dfffa8599..8bb7002e91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,8 @@ cache: before_script: - mkdir -p "$R_LIBS_USER" + - git config --global user.email "cpsievert1@gmail.com" + - git config --global user.name "Carson Sievert" - echo "Sys.setenv('plotly_username' = 'cpsievert')" > ~/.Rprofile - git clone https://github.com/cpsievert/plotly-test-table.git ../plotly-test-table - "wget -q -O - https://github.com/yihui/crandalf/raw/master/inst/scripts/install-pandoc | bash" diff --git a/DESCRIPTION b/DESCRIPTION index 70227bb4e6..2089a27455 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: plotly Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library -Version: 2.3.0 +Version: 2.3.1 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"), email = "cpsievert1@gmail.com"), person("Chris", "Parmer", role = c("aut", "cph"), diff --git a/NEWS b/NEWS index 303d11692c..0cfb2aa175 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +2.3.1 -- 25 Jan 2015 + +More accurate conversion of path width. Fixes #373. + 2.3.0 -- 19 Jan 2015 Add sharing argument and deprecate world_readable. Fixes #332 From 23f4262289b2cd429c29003b9cc85adb344badce Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 13:02:57 -0600 Subject: [PATCH 13/15] more travis tweaks --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8bb7002e91..250936b935 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ addons: packages: - r-base-dev - r-recommended - - qpdf env: global: @@ -34,13 +33,12 @@ before_script: - Rscript -e 'devtools::install_deps(repos = "http://cran.rstudio.com", dependencies = TRUE)' - cd ..; rm -f *.tar.gz; R CMD build $R_PKG - R CMD INSTALL ${R_PKG}_*.tar.gz - - cd plotly script: # run R CMD check on the non-pull request build - - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then Rscript -e 'devtools::check()'; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then R CMD check ${R_PKG}_*.tar.gz --no-manual; fi" # we do some fancy stuff on the pull request build that confuses R CMD check - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"tests/testthat.R\", chdir = T)'; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'testthat::test_check(\"plotly\")'; fi" after_success: - cd ../plotly-test-table From a9b1a08153732bedc903005e8bbcb1aafc81443e Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 13:22:33 -0600 Subject: [PATCH 14/15] avoid dependencies --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 250936b935..76cffd01d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,7 +38,7 @@ script: # run R CMD check on the non-pull request build - sh -c "if [ '$TRAVIS_PULL_REQUEST' = 'false' ]; then R CMD check ${R_PKG}_*.tar.gz --no-manual; fi" # we do some fancy stuff on the pull request build that confuses R CMD check - - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'testthat::test_check(\"plotly\")'; fi" + - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"plotly/tests/testthat.R\", chdir = T)'; fi" after_success: - cd ../plotly-test-table From 4c93edc8fd4cd0439c9e745cf3bfc09e6f0bd955 Mon Sep 17 00:00:00 2001 From: cpsievert Date: Mon, 25 Jan 2016 14:00:58 -0600 Subject: [PATCH 15/15] moar directory fun --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 76cffd01d4..8091addbd1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,5 +41,5 @@ script: - sh -c "if [ '$TRAVIS_PULL_REQUEST' != 'false' ]; then Rscript -e 'source(\"plotly/tests/testthat.R\", chdir = T)'; fi" after_success: - - cd ../plotly-test-table + - cd plotly-test-table - Rscript ../plotly/inst/build-push-comment.R