Skip to content

API redesign #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
ed850cc
redesign mostly working
cpsievert May 5, 2015
07242ed
merge with master
cpsievert May 5, 2015
0643a23
merge with master again
cpsievert May 5, 2015
2592778
R CMD check is passing; too bad we can't use RStudio preview
cpsievert May 5, 2015
ff05384
Always knit asis
cpsievert May 5, 2015
b93e64b
Add simple knitr test
cpsievert May 5, 2015
c50e637
merge with toby-cookbook-lines
cpsievert May 5, 2015
c3001b3
delete run_tests_with_outputs.R
cpsievert May 5, 2015
6f5fb99
support for different domains, cat env vars to .Rprofile, polish and …
cpsievert May 6, 2015
05709e9
fix bad example
cpsievert May 6, 2015
492e4b9
Merge branch 'master' of https://github.com/ropensci/plotly into cars…
cpsievert May 7, 2015
a21ad8f
we'll have to use cpsievert/plotly-test-table for now because of back…
cpsievert May 7, 2015
be3e5b3
self-contained & more efficient test table builds
cpsievert May 9, 2015
1667863
clone into parent directory
cpsievert May 9, 2015
6b35854
Install devtools
cpsievert May 9, 2015
e4c5a37
option to ignore ggplot2 errors
cpsievert May 9, 2015
564b63b
Maybe error is related to R_TESTS variable weirdness?
cpsievert May 9, 2015
8366fbd
Add basic print methods; dontrun API examples; suggest devtools
cpsievert May 9, 2015
4779a27
Fix httr:: namespace issue
cpsievert May 9, 2015
cb6e104
if you use a package in tests, you _must_ put in DESCRIPTION now
cpsievert May 9, 2015
9011e72
Create dir if not exists
cpsievert May 9, 2015
7aa37af
typo
cpsievert May 9, 2015
dfaf4bd
ggsave() seems to be broken
cpsievert May 9, 2015
1aec968
only save outputs for travis pull requests
cpsievert May 9, 2015
b6fb06c
R CMD check suppress output; so we have to keep tests under 10 minutes
cpsievert May 9, 2015
c7fc7fd
Create directories if necessary; ggplot2 error handling
cpsievert May 9, 2015
1ba6857
derp
cpsievert May 9, 2015
61b180e
Define save_outputs() in testthat.R; place build-push-comment.R under…
cpsievert May 11, 2015
d13e61d
updates in .travis.yml accordingly
cpsievert May 11, 2015
43e75f5
Forgot to add tests/build-push-comment.R
cpsievert May 11, 2015
ca9195d
hmm, that's a strange error, try test_dir()
cpsievert May 11, 2015
837e36e
I wonder if craigcitro/r-travis does this right
cpsievert May 12, 2015
fa88bd5
before_script happens after install
cpsievert May 12, 2015
3167d34
huh, looks like some changes were just introduced into nativ R builds
cpsievert May 12, 2015
5c25a69
try local = FALSE
cpsievert May 12, 2015
a662ce7
oops, move build-push-comment.R to inst/ since anything under tests/ …
cpsievert May 12, 2015
dd0ceeb
Yay\! Progress, finally\!
cpsievert May 12, 2015
7ccd7c2
Always source the newest testthat.R script
cpsievert May 12, 2015
ce65cb0
Use chdir
cpsievert May 12, 2015
658c000
avoid stopping on test error
cpsievert May 12, 2015
69e3db9
devtools doesn't report hash for local installs
cpsievert May 12, 2015
76923e2
why does this hash dir not exist?
cpsievert May 12, 2015
6ef13d9
If only I could pull down the travis build locally
cpsievert May 12, 2015
5c4c207
recursive ls
cpsievert May 12, 2015
a321dc3
ah, dirname of is plotly
cpsievert May 12, 2015
5d5499b
navigate into plotly-test-table
cpsievert May 12, 2015
c0f1ca9
debug statements
cpsievert May 13, 2015
16e22dd
wasn't creating a dir for each ggplot version
cpsievert May 13, 2015
01d4e62
Thanks for nothing R CMD check
cpsievert May 13, 2015
7cf2e20
install
cpsievert May 13, 2015
c8488f7
underscores
cpsievert May 19, 2015
4f1406a
merge conflicts with master
cpsievert May 26, 2015
3248ca9
Merge branch 'master' of https://github.com/ropensci/plotly into cars…
cpsievert May 28, 2015
026371a
underscores in env vars
cpsievert May 28, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
language: r
language: c

env:
global:
- secure: "cJ1bDRrAdIRjG+JnsQI9CdA4wQJhJJ2DdCNQ3frl8dotk69z61EiGCFW1Ir1cAY5V/NbHvFHp91HDiSo28ggwqRkEPBOGE44ico5gtVaELu3M/EnkWc2ZwQoN1273Vfdm26QYidqrvWrpLZ0XkFl7Q8xgvBswx30MF7y61+0Hv4="
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

r_packages:
- RCurl
- RJSONIO
- lattice
- xtable
- httr
install:
- ./travis-tool.sh install_deps

before_script:
- chmod 755 inst/testscripts/.push_test_table.sh
- git config --global user.name "cpsievert"
- git config --global user.email "[email protected]"
- git clone https://github.com/cpsievert/plotly-test-table.git ../plotly-test-table

script:
- Rscript -e "devtools::install(); source('tests/testthat.R', chdir = TRUE)"

after_success:
- inst/testscripts/.push_test_table.sh
- cd ..
- Rscript plotly/inst/build-push-comment.R

env:
global:
- secure: "cJ1bDRrAdIRjG+JnsQI9CdA4wQJhJJ2DdCNQ3frl8dotk69z61EiGCFW1Ir1cAY5V/NbHvFHp91HDiSo28ggwqRkEPBOGE44ico5gtVaELu3M/EnkWc2ZwQoN1273Vfdm26QYidqrvWrpLZ0XkFl7Q8xgvBswx30MF7y61+0Hv4="
9 changes: 5 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ Description: An interface to plotly's online graphing tools with desktop R
URL: https://github.com/ropensci/plotly
BugReports: https://github.com/ropensci/plotly/issues
Depends:
RCurl,
RJSONIO,
ggplot2
Imports:
knitr
httr,
RJSONIO
Suggests:
maps,
testthat
testthat,
knitr,
devtools
11 changes: 5 additions & 6 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# Generated by roxygen2 (4.1.1): do not edit by hand

export(embed_notebook)
export(get_figure)
export(gg2list)
export(ggplot_build2)
export(group2NA)
export(knit_print.clientresp)
export(layer2traces)
export(paramORdefault)
export(plotly)
export(set_config_file)
export(set_credentials_file)
export(show_config_file)
export(show_credentials_file)
export(plotly_POST)
export(signup)
export(toRGB)
import(RCurl)
import(RJSONIO)
import(ggplot2)
import(knitr)
import(httr)
Loading