Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 18 additions & 15 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,31 @@ language: r
distro: xenial # binary packages
sudo: true # dito
cache: packages
branches:
only:
- master

r:
- oldrel
- release
- devel
- oldrel
- release
- devel

r_binary_packages:
# Additional packages for tests...
- roxygen2
- devtools
# Additional packages for tests...
- roxygen2
- devtools

addons:
apt:
packages:
# Install the headers for the Cairo package.
- libcairo2-dev
- libjpeg-dev
# Install the headers for the Cairo package.
- libcairo2-dev
- libjpeg-dev

script:
- R CMD build .
- R CMD check IRdisplay*.tar.gz --as-cran
- cat "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log"
- grep -q -R 'WARNING' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log" ; [ $? -ne 0 ]
- grep -q -R 'NOTE' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log"; [ $? -ne 0 ]
- Rscript -e 'devtools::test(reporter="check")'
- R CMD build .
- R CMD check IRdisplay*.tar.gz --as-cran
- cat "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log"
- grep -q -R 'WARNING' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log" ; [ $? -ne 0 ]
- grep -q -R 'NOTE' "/home/travis/build/IRkernel/IRdisplay/IRdisplay.Rcheck/00check.log"; [ $? -ne 0 ]
- Rscript -e 'devtools::test(reporter="check")'
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ Imports:
License: MIT + file LICENSE
LazyData: true
Encoding: UTF-8
RoxygenNote: 6.1.1
RoxygenNote: 7.1.1
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export(display_markdown)
export(display_pdf)
export(display_png)
export(display_svg)
export(display_text)
export(irdisplay_option_defaults)
export(prepare_mimebundle)
export(publish_mimebundle)
Expand Down
4 changes: 4 additions & 0 deletions R/display_textual.r
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
#' @rdname display-textual
NULL

#' @rdname display-textual
#' @export
display_text <- function(data = NULL, file = NULL) display_raw('text/plain', FALSE, data, file)

#' @rdname display-textual
#' @export
display_json <- function(data = NULL, file = NULL) display_raw('application/json', FALSE, data, file)
Expand Down
1 change: 1 addition & 0 deletions R/options.r
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#' }
#'
#' @rdname IRdisplay-options
#' @aliases IRdisplay-options
#' @export
irdisplay_option_defaults <- list(
jupyter.display_mimetypes = c(
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
IRdisplay [![b-Travis]][Travis] [![b-CRAN]][CRAN]
=========

[b-Travis]: https://travis-ci.org/IRkernel/IRdisplay.svg?branch=master "Build status"
[Travis]: https://travis-ci.org/IRkernel/IRdisplay
[b-Travis]: https://travis-ci.com/IRkernel/IRdisplay.svg?branch=master "Build status"
[Travis]: https://travis-ci.com/IRkernel/IRdisplay
[b-CRAN]: https://www.r-pkg.org/badges/version/IRdisplay "Comprehensive R Archive Network"
[CRAN]: https://cran.r-project.org/package=IRdisplay

Expand Down
5 changes: 4 additions & 1 deletion man/IRdisplay-options.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions man/display-textual.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 12 additions & 5 deletions man/display.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.