From a47a7e040787af2b693dd697e82a0a5deecbc540 Mon Sep 17 00:00:00 2001 From: Barret Schloerke Date: Tue, 12 Nov 2019 11:03:20 -0500 Subject: [PATCH] v0.10.0 (#271) * add revdep checks * fix missing var from bad merge * bump version to v0.10.0 * run revdep * remove remotes for checking * rerun revdep * Use cran comments * spelling * Remove completed TODO-barret 's * document * fix link * ignore cran-release --- .Rbuildignore | 3 +++ DESCRIPTION | 5 +---- NEWS.md | 4 ++-- R/quiz.R | 32 +------------------------------- R/quiz_print.R | 4 ++-- cran-comments.md | 30 ++++++++++++++++++++++++++++++ man/format_quiz.Rd | 4 ++-- man/quiz.Rd | 2 +- revdep/.gitignore | 6 ++++++ revdep/README.md | 23 +++++++++++++++++++++++ revdep/email.yml | 5 +++++ revdep/failures.md | 1 + revdep/problems.md | 1 + 13 files changed, 78 insertions(+), 42 deletions(-) create mode 100644 cran-comments.md create mode 100644 revdep/.gitignore create mode 100644 revdep/README.md create mode 100644 revdep/email.yml create mode 100644 revdep/failures.md create mode 100644 revdep/problems.md diff --git a/.Rbuildignore b/.Rbuildignore index 81d125676..624a1beab 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -16,4 +16,7 @@ rsconnect/ ^\.github/ ^inst/tutorials/.*\.html$ +^revdep$ ^LICENSE\.md$ +^cran-comments\.md$ +^CRAN-RELEASE$ diff --git a/DESCRIPTION b/DESCRIPTION index e552c5aba..1ccbedaa5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: learnr Type: Package Title: Interactive Tutorials for R -Version: 0.9.2.9006 +Version: 0.10.0 Authors@R: c( person("Barret", "Schloerke", role = c("aut", "cre"), email = "barret@rstudio.com", comment = c(ORCID = "0000-0001-9986-114X")), @@ -33,12 +33,9 @@ Imports: markdown, shiny (>= 1.0), rmarkdown (>= 1.12.0), - packrat (>= 0.5.0-7), ellipsis (>= 0.2.0.1), checkmate, renv (>= 0.8.0) -Remotes: - rstudio/packrat Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) diff --git a/NEWS.md b/NEWS.md index 026ebed88..391370cb8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -learnr 0.10.0 (unreleased) +learnr 0.10.0 =========== ## New features @@ -11,7 +11,7 @@ learnr 0.10.0 (unreleased) * Added the last evaluated exercise submission value, `last_value`, as an exercise checker function argument. ([#228](https://github.com/rstudio/learnr/pull/228)) -* Added tabset support. ([#219](https://github.com/rstudio/learnr/pull/219) [#213](https://github.com/rstudio/learnr/issues/213)) +* Added tabset support. ([#219](https://github.com/rstudio/learnr/pull/219) [#212](https://github.com/rstudio/learnr/issues/212)) * Question width will expand to the container width. ([#222](https://github.com/rstudio/learnr/pull/222)) diff --git a/R/quiz.R b/R/quiz.R index 682b2845b..4a3d45526 100644 --- a/R/quiz.R +++ b/R/quiz.R @@ -3,39 +3,9 @@ # X - Allow for null input$answer ## No. If the quiz module wants a null value, it can provide a placeholder value that is not NULL -# √-barret revert to old params names in question - ## or deprecate old names and use new names - ## double check answer params -# √-barret gut unused R and JS methods from old JS quiz hooks - -# √ TODO-barret question / quiz print method - ## If a quiz is printed in the console... should it open in the browser or print a list? - ## either way it should be document or fixed -# TODO-barret Documentation - # TODO-barret re-render tutorials - # TODO-barret re-render documentation pictures - # √-barret A new question type (“text”) - # TODO-barret You can now extend learnr with your own question types - # TODO-barret Questions are now Shiny apps - # TODO-barret print() behavior is different from before -# TODO-barret R CMD check/rev-dep check -# TODO-barret QA pass (check existing education primers) - - -# √-barret make the question div a class and data-label combo to be found at render, like an exercise -# √-barret validate that chunk lables do not have unwanted characters to function better on JS side -# √-barret chunk labels are now NS ids -# √-barret use the new label in js to attach the element right away, regardless if it is ready or not - ## this allows js to function regardless of state of the quiz question - ## this allows for sections to be completed regardless of what is returned from the user - - - - - #' Tutorial quiz questions #' -#' Add interative quiz questions to a tutorial. +#' Add interactive quiz questions to a tutorial. #' Each quiz question is executed within a shiny runtime to provide more flexibility in the types of questions offered. #' There are three default types of quiz questions: #' \describe{ diff --git a/R/quiz_print.R b/R/quiz_print.R index dc9199ee7..8749ad79e 100644 --- a/R/quiz_print.R +++ b/R/quiz_print.R @@ -1,9 +1,9 @@ -#' Formatting and printing quizes, questions, and answers +#' Formatting and printing quizzes, questions, and answers #' #' Notes: #' \itemize{ #' \item If custom question types are created, custom s3 formating methods may be implemented as well. -#' \item Due to the shiny runtime of questions, a text representation of quizes, questions, and answers will be presented. +#' \item Due to the shiny runtime of questions, a text representation of quizzes, questions, and answers will be presented. #' } #' #' @param x object of interest diff --git a/cran-comments.md b/cran-comments.md new file mode 100644 index 000000000..4b7625b18 --- /dev/null +++ b/cran-comments.md @@ -0,0 +1,30 @@ + +## Comments +### 2019-11-08 + +Please let me know if there is anything I can do. + +Thank you, +Barret + + +## Test environments +* local OS X install, R 3.6.1 +* ubuntu 14.04 (on travis-ci), release, oldrel, devel +* win-builder (oldrelease, release, devel) +* R-hub windows-x86_64-release (r-release) +* R-hub windows-x86_64-devel (r-devel) +* R-hub ubuntu-gcc-release (r-release) +* R-hub fedora-clang-devel (r-devel) + +## R CMD check results + +0 errors ✔ | 0 warnings ✔ | 0 notes ✔ + + +## revdepcheck results + +We checked 4 reverse dependencies (3 from CRAN + 1 from BioConductor), comparing R CMD check results across CRAN and dev versions of this package. + +* We saw 0 new problems +* We failed to check 0 packages diff --git a/man/format_quiz.Rd b/man/format_quiz.Rd index 0eb933d78..6f0883e11 100644 --- a/man/format_quiz.Rd +++ b/man/format_quiz.Rd @@ -7,7 +7,7 @@ \alias{print.tutorial_question} \alias{print.tutorial_question_answer} \alias{print.tutorial_quiz} -\title{Formatting and printing quizes, questions, and answers} +\title{Formatting and printing quizzes, questions, and answers} \usage{ \method{format}{tutorial_question_answer}(x, ..., spacing = "") @@ -32,7 +32,7 @@ Notes: \itemize{ \item If custom question types are created, custom s3 formating methods may be implemented as well. -\item Due to the shiny runtime of questions, a text representation of quizes, questions, and answers will be presented. +\item Due to the shiny runtime of questions, a text representation of quizzes, questions, and answers will be presented. } } \examples{ diff --git a/man/quiz.Rd b/man/quiz.Rd index cbc2c57b9..7a53a335f 100644 --- a/man/quiz.Rd +++ b/man/quiz.Rd @@ -62,7 +62,7 @@ message alongside the \code{message} message value.} \item{options}{Extra options to be stored in the question object.} } \description{ -Add interative quiz questions to a tutorial. +Add interactive quiz questions to a tutorial. Each quiz question is executed within a shiny runtime to provide more flexibility in the types of questions offered. There are three default types of quiz questions: \describe{ diff --git a/revdep/.gitignore b/revdep/.gitignore new file mode 100644 index 000000000..31f6c40d7 --- /dev/null +++ b/revdep/.gitignore @@ -0,0 +1,6 @@ +checks +library +checks.noindex +library.noindex +data.sqlite +*.html diff --git a/revdep/README.md b/revdep/README.md new file mode 100644 index 000000000..b9c283760 --- /dev/null +++ b/revdep/README.md @@ -0,0 +1,23 @@ +# Platform + +|field |value | +|:--------|:----------------------------| +|version |R version 3.6.1 (2019-07-05) | +|os |macOS Mojave 10.14.6 | +|system |x86_64, darwin15.6.0 | +|ui |X11 | +|language |(EN) | +|collate |en_US.UTF-8 | +|ctype |en_US.UTF-8 | +|tz |America/New_York | +|date |2019-11-08 | + +# Dependencies + +|package |old |new |Δ | +|:-------|:-------|:------|:--| +|learnr |0.9.2.1 |0.10.0 |* | +|Rcpp |NA |1.0.2 |* | + +# Revdeps + diff --git a/revdep/email.yml b/revdep/email.yml new file mode 100644 index 000000000..0c5cef871 --- /dev/null +++ b/revdep/email.yml @@ -0,0 +1,5 @@ +release_date: ??? +rel_release_date: ??? +my_news_url: ??? +release_version: ??? +release_details: ??? diff --git a/revdep/failures.md b/revdep/failures.md new file mode 100644 index 000000000..9a2073633 --- /dev/null +++ b/revdep/failures.md @@ -0,0 +1 @@ +*Wow, no problems at all. :)* \ No newline at end of file diff --git a/revdep/problems.md b/revdep/problems.md new file mode 100644 index 000000000..9a2073633 --- /dev/null +++ b/revdep/problems.md @@ -0,0 +1 @@ +*Wow, no problems at all. :)* \ No newline at end of file