Skip to content

Commit 18d87d7

Browse files
committed
Merge branch 'master' of https://github.com/ropensci/plotly into baobao-geom_jitter
2 parents 6cc033c + 0e91034 commit 18d87d7

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

.travis.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,3 @@ before_script:
1616

1717
after_success:
1818
- inst/testscripts/.push_test_table.sh
19-
20-
notifications:
21-
slack:
22-
secure: YvyGtGRFC4HJGD4d2Vx6fHU93EliJCHbcf/k9/Rbpl3wtYFZfWKbKL1FHvPw/g3auVebonz8hScnYzR0uYnR3dHSlmj3QrJ3NOePv5QAZRHy7aY/XKRr5JR1Ji/vX1yfbrJDmiYuGMxJVE8l/kbu0TxwDdLletY5nJpwlkHfaW8=

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: plotly
22
Type: Package
33
Title: Interactive, publication-quality graphs online.
4-
Version: 0.6.1
4+
Version: 0.6.2
55
Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
66
email = "[email protected]"),
77
person("Scott", "Chamberlain", role = "aut",

NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.6.2 -- 19 May 2015
2+
3+
In geom_bar(stat = "identity"), sum y values if multiple for a given x.
4+
15
0.6.1 -- 5 May 2015
26

37
Add test-cookbook-lines.R and fix bugs that showed up in those tests.

R/plotly-package.r

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#' \itemize{
88
#' \item Package: plotly
99
#' \item Type: Package
10-
#' \item Version: 0.6.1
10+
#' \item Version: 0.6.2
1111
#' \item Date: 2014-03-07
1212
#' \item License: MIT
1313
#' }

R/plotly.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ For more help, see https://plot.ly/R or contact <[email protected]>.")
8282

8383
# public attributes/methods that the user has access to
8484
pub <- list(username=username, key=key, filename="from api", fileopt=NULL,
85-
version="0.6.1")
85+
version="0.6.2")
8686
priv <- list()
8787

8888
pub$makecall <- function(args, kwargs, origin) {

man/plotly-package.Rd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ An example of an interactive graph made from the R API: https://plot.ly/~chris/4
1515
\itemize{
1616
\item Package: plotly
1717
\item Type: Package
18-
\item Version: 0.6.1
18+
\item Version: 0.6.2
1919
\item Date: 2014-03-07
2020
\item License: MIT
2121
}

tests/testthat/test-ggplot-bar.R

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,5 +202,3 @@ test_that("For a given x value, if multiple y exist, sum them. ", {
202202
y <- y[info$traces[[1]]$x]
203203
expect_equal(info$traces[[1]]$y, as.numeric(y))
204204
})
205-
206-

0 commit comments

Comments
 (0)