Merge branch 'master' of https://github.com/ropensci/plotly into baobao-geom_jitter

Author: cpsievert

.travis.yml

@@ -16,7 +16,3 @@ before_script:
 
 after_success:
   - inst/testscripts/.push_test_table.sh
-
-notifications:
-  slack:
-    secure: YvyGtGRFC4HJGD4d2Vx6fHU93EliJCHbcf/k9/Rbpl3wtYFZfWKbKL1FHvPw/g3auVebonz8hScnYzR0uYnR3dHSlmj3QrJ3NOePv5QAZRHy7aY/XKRr5JR1Ji/vX1yfbrJDmiYuGMxJVE8l/kbu0TxwDdLletY5nJpwlkHfaW8=

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.6.1
+Version: 0.6.2
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "[email protected]"),
     person("Scott", "Chamberlain", role = "aut",

NEWS

@@ -1,3 +1,7 @@
+0.6.2 -- 19 May 2015
+
+In geom_bar(stat = "identity"), sum y values if multiple for a given x.
+
 0.6.1 -- 5 May 2015
 
 Add test-cookbook-lines.R and fix bugs that showed up in those tests.

R/plotly-package.r

@@ -7,7 +7,7 @@
 #' \itemize{
 #'  \item Package: plotly
 #'  \item Type: Package
-#'  \item Version: 0.6.1
+#'  \item Version: 0.6.2
 #'  \item Date: 2014-03-07
 #'  \item License: MIT
 #' }

R/plotly.R

@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
 
   # public attributes/methods that the user has access to
   pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
-              version="0.6.1")
+              version="0.6.2")
   priv <- list()
 
   pub$makecall <- function(args, kwargs, origin) {

man/plotly-package.Rd

@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
 \itemize{
  \item Package: plotly
  \item Type: Package
- \item Version: 0.6.1
+ \item Version: 0.6.2
  \item Date: 2014-03-07
  \item License: MIT
 }

tests/testthat/test-ggplot-bar.R

@@ -202,5 +202,3 @@ test_that("For a given x value, if multiple y exist, sum them. ", {
   y <- y[info$traces[[1]]$x]
   expect_equal(info$traces[[1]]$y, as.numeric(y))
 })
-
-