Merge branch 'master' of https://github.com/ropensci/plotly into fix/bar-coord-flip

Author: cpsievert

.Rbuildignore

@@ -1,10 +1,6 @@
 .travis.yml
-Karthik_local.R
-Makefile
-man-roxygen
-man-roxygen/^.*\.Rproj$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^data-raw$
-vignettes/margins.sty
 CONDUCT.md
+CONTRIBUTING.md

.gitignore

@@ -1,8 +1,5 @@
-R/.Rhistory
 Rapp.history
-/Karthik_local.R
 *~
-.Rhistory
-.RData
-Makefile
-.Rproj.user
+*.Rhistory
+*.RData
+*.Rproj.user

.travis.yml

@@ -1,30 +1,39 @@
 language: c
+sudo: false
 
-before_install:
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
-  # password is encrypted below
-  - echo "Sys.setenv('plotly_username' = 'RTestBot3000')" > ~/.Rprofile
+addons:
+  apt:
+    sources:
+      - r-packages-precise
+    packages:
+      - r-base-dev
+      - r-recommended
+      - qpdf
+
+env:
+  - NOT_CRAN=true R_LIBS_USER=~/R/library
+  global:
+    # plotly_api_key (for posting to plot.ly)
+    - secure: "UAETDsmeXkXm9eUpZa3JTm8/cv+jyLmArXE0TQD0yQNICFNPkGeNergoQmkesRqG+ifLu6V1lPXu1XlqQPdXY60clUHThDN+AjsBmcv9F170k6RtBSV8pIKL9fsW8t0v/maEet86qOSf3cNa5+gK8GjBH1pmLrN2rF9r7RhwUdg="
+    # GITHUB_PAT (for pushing to plotly-test-table)
+    - secure: "LHJONgWOo+98vNeFLI7LSJU3RtbMVszlI79GB8CcXmc2mlgM/UtZ5b6RnkNlhmg3Gj1/uObfm/rIybVTwuS1yNpeKv73+gsZOYhobVXiUGVxdRFG/mg5mbqwyWkkuofjPGFlMZCEMgHim37eZzgjSibwVH1LClRDsCoFMCgvgV0="
 
-install:
-  - ./travis-tool.sh install_deps
+cache:
+  directories:
+    $R_LIBS_USER
 
 before_script:
-  - git config --global user.name "cpsievert"
-  - git config --global user.email "cpsievert1@gmail.com"
+  - mkdir -p "$R_LIBS_USER"
+  - echo "Sys.setenv('plotly_username' = 'RTestBot3000')" > ~/.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"
+  - 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)'
 
 script:
-  - Rscript -e "devtools::install(); source('tests/testthat.R', chdir = TRUE)"
+  - Rscript -e 'devtools::install(); source("tests/testthat.R", chdir = T)'
 
 after_success:
   - cd ../plotly-test-table
   - Rscript ../plotly/inst/build-push-comment.R
-
-env:
-  global:
-    # plotly_api_key (for posting to plot.ly)
-    - secure: "UAETDsmeXkXm9eUpZa3JTm8/cv+jyLmArXE0TQD0yQNICFNPkGeNergoQmkesRqG+ifLu6V1lPXu1XlqQPdXY60clUHThDN+AjsBmcv9F170k6RtBSV8pIKL9fsW8t0v/maEet86qOSf3cNa5+gK8GjBH1pmLrN2rF9r7RhwUdg="
-    # GITHUB_PAT (for pushing to plotly-test-table)
-    - secure: "LHJONgWOo+98vNeFLI7LSJU3RtbMVszlI79GB8CcXmc2mlgM/UtZ5b6RnkNlhmg3Gj1/uObfm/rIybVTwuS1yNpeKv73+gsZOYhobVXiUGVxdRFG/mg5mbqwyWkkuofjPGFlMZCEMgHim37eZzgjSibwVH1LClRDsCoFMCgvgV0="    

man/plot_ly.Rd

@@ -34,6 +34,6 @@ test_that("can add traces to a subplot figure", {
   fig <- get_figure('chelsea_lyn', 6366)
   p <- add_trace(fig, x=c(1, 2, 3), y=c(4, 2, 4))
   l <- plotly_build(p)
-  expect_equivalent(length(fig$data) + 1, length(l$data))
+  expect_equivalent(length(plotly_build(fig)$data) + 1, length(l$data))
 })