From 691a100736d108562b1c77477fd6e4572d8aefeb Mon Sep 17 00:00:00 2001 From: adrtod Date: Mon, 8 Mar 2021 20:33:09 +0100 Subject: [PATCH] version 1.3.4 skip tests on cran add condition on publish example --- DESCRIPTION | 2 +- NEWS.md | 4 ++++ R/new.r | 4 +++- cran-comments.md | 8 -------- man/publish.Rd | 4 +++- tests/testthat/test-pandoc.R | 1 + 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 79f7836..0266b7f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rchallenge Title: A Simple Data Science Challenge System -Version: 1.3.3 +Version: 1.3.4 Authors@R: c(person("Adrien", "Todeschini", email = "adrien.todeschini@gmail.com", role=c("aut", "cre")), person("Robin", "Genuer", email = "robin.genuer@isped.u-bordeaux2.fr", role=c("ctb"))) Description: A simple data science challenge system using R Markdown and 'Dropbox' . diff --git a/NEWS.md b/NEWS.md index ba985f8..94db290 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# rchallenge 1.3.4 (08-03-2021) +- Skip test for pandoc availability on CRAN. +- Added condition on publish() example. + # rchallenge 1.3.3 (05-03-2021) - Use South German Credit data from [UCI ML Repository](https://archive.ics.uci.edu/ml/datasets/South+German+Credit) diff --git a/R/new.r b/R/new.r index 84bf293..8ff28c6 100644 --- a/R/new.r +++ b/R/new.r @@ -232,7 +232,9 @@ new_team <- function(..., path = ".", submissions_dir = "submissions", #' wd <- setwd(path) #' new_challenge() #' outdir = tempdir() -#' publish(output_dir = outdir, output_options = list(self_contained = FALSE)) +#' if (rmarkdown::pandoc_available('1.12.3')) { +#' publish(output_dir = outdir, output_options = list(self_contained = FALSE)) +#' } #' unlink(outdir) #' setwd(wd) #' unlink(path) diff --git a/cran-comments.md b/cran-comments.md index 31f33cf..ba4654f 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -21,11 +21,3 @@ We checked 0 reverse dependencies, comparing R CMD check results across CRAN and * We saw 0 new problems * We failed to check 0 packages -## Resubmission - -This is a resubmission. In this version I have: - -* changed http --> https, added trailing slashes, or followed moved content as - appropriate. - -* linked to files in the package or used fully specified URLs. diff --git a/man/publish.Rd b/man/publish.Rd index c8b4f61..8760b7c 100644 --- a/man/publish.Rd +++ b/man/publish.Rd @@ -44,7 +44,9 @@ path <- tempdir() wd <- setwd(path) new_challenge() outdir = tempdir() -publish(output_dir = outdir, output_options = list(self_contained = FALSE)) +if (rmarkdown::pandoc_available('1.12.3')) { + publish(output_dir = outdir, output_options = list(self_contained = FALSE)) +} unlink(outdir) setwd(wd) unlink(path) diff --git a/tests/testthat/test-pandoc.R b/tests/testthat/test-pandoc.R index 0c5ff6f..c6e69d0 100644 --- a/tests/testthat/test-pandoc.R +++ b/tests/testthat/test-pandoc.R @@ -1,3 +1,4 @@ test_that("pandoc available", { + skip_on_cran() expect_true(rmarkdown::pandoc_available('1.12.3')) })