Skip to content

Commit 56576af

Browse files
schloerkeschloerke
authored
v0.10.1 (#332)
* test run revdep. all pass * bump version to 0.10.1 * move deploy workflow into check workflow and need all checks to pass first * Fix broken link * Run revdepcheck() * do not make testthat a required test package * update cran comments * document ./docs * make sure it is a push event. (Only master or ghactions from above definition)
1 parent 89c1d14 commit 56576af

File tree

14 files changed

+112
-101
lines changed

14 files changed

+112
-101
lines changed

‎.github/workflows/R-CMD-check.yaml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,63 @@ jobs:
8787
run: >
8888
Rscript
8989
-e 'covr::codecov(token = "${{secrets.CODECOV_TOKEN}}")'
90+
91+
92+
93+
94+
deploy:
95+
if: github.repository == 'rstudio/learnr' && github.event_name == 'push'
96+
runs-on: ${{ matrix.config.os }}
97+
98+
name: "Deploy to shinyapps.io"
99+
needs: [R-CMD-check]
100+
101+
strategy:
102+
fail-fast: false
103+
matrix:
104+
config:
105+
- {os: ubuntu-16.04, r: '3.6', cran: "https://demo.rstudiopm.com/all/__linux__/xenial/latest"}
106+
107+
env:
108+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
109+
CRAN: ${{ matrix.config.cran }}
110+
111+
steps:
112+
- uses: actions/checkout@v1
113+
114+
- uses: r-lib/actions/setup-r@master
115+
with:
116+
r-version: ${{ matrix.config.r }}
117+
118+
- uses: r-lib/actions/setup-pandoc@master
119+
120+
- name: Query dependencies
121+
run: >
122+
Rscript
123+
-e "install.packages('remotes')"
124+
-e "saveRDS(remotes::dev_package_deps(dependencies = TRUE), 'depends.Rds', version = 2)"
125+
126+
- name: Cache R packages
127+
if: runner.os != 'Windows'
128+
uses: actions/cache@v1
129+
with:
130+
path: ${{ env.R_LIBS_USER }}
131+
key: ${{ runner.os }}-r-${{ matrix.config.r }}-deploy-${{ hashFiles('depends.Rds') }}
132+
restore-keys: |
133+
${{ runner.os }}-r-${{ matrix.config.r }}-deploy-
134+
${{ runner.os }}-r-${{ matrix.config.r }}-
135+
136+
- name: Install dependencies
137+
run: >
138+
Rscript
139+
-e "library(remotes)"
140+
-e "update(readRDS('depends.Rds'))"
141+
-e "remotes::install_cran('sortable')"
142+
143+
- name: Deploy
144+
env:
145+
SHINYAPPS_NAME: ${{ secrets.SHINYAPPS_NAME }}
146+
SHINYAPPS_TOKEN: ${{ secrets.SHINYAPPS_TOKEN }}
147+
SHINYAPPS_SECRET: ${{ secrets.SHINYAPPS_SECRET }}
148+
run: >
149+
Rscript 'tools/deploy_tutorials_on_ci.R'

‎.github/workflows/deploy.yaml

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: learnr
22
Type: Package
33
Title: Interactive Tutorials for R
4-
Version: 0.10.0.9000
4+
Version: 0.10.1
55
Authors@R: c(
66
person("Barret", "Schloerke", role = c("aut", "cre"), email = "barret@rstudio.com",
77
comment = c(ORCID = "0000-0001-9986-114X")),

‎NEWS.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
learnr 0.10.0.9000 (unreleased)
1+
learnr 0.10.1
22
===========
33

44
## New features
@@ -19,7 +19,7 @@ learnr 0.10.0.9000 (unreleased)
1919

2020
* Fixed extra parameter documentation bug for CRAN. ([#323](https://github.com/rstudio/learnr/pull/323))
2121

22-
* Fixed video initialization error caused by a jQuery version increase in Shiny. ([#326](https://github.com/rstudio/learnr/pull/#326))
22+
* Fixed video initialization error caused by a jQuery version increase in Shiny. ([#326](https://github.com/rstudio/learnr/pull/326))
2323

2424
* Fixed progressive reveal bug where the next section would not be displayed unless refreshed. ([#330](https://github.com/rstudio/learnr/pull/330))
2525

‎cran-comments.md

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,41 @@
11

22
## Comments
3-
### 2019-11-08
3+
### 2020-02-12
4+
5+
I have addressed the extra parameter documentation and made other improvements to learnr.
46

57
Please let me know if there is anything I can do.
68

79
Thank you,
810
Barret
911

12+
### 2020-02-03
13+
14+
Specifically, see the warnings about 'Documented arguments not in
15+
\usage' in the r-devel checks. These are from a recent bug fix
16+
(PR#16223, see
17+
<https://bugs.r-project.org/bugzilla/show_bug.cgi?id=16223>): can you
18+
please fix your man pages as necessary? (In most cases, remove the
19+
documentation for argument '...'.)
20+
21+
Please correct before 2020-02-17 to safely retain your package on CRAN.
22+
23+
Best,
24+
-k
25+
1026

1127
## Test environments
1228
* local OS X install, R 3.6.1
13-
* ubuntu 14.04 (on travis-ci), release, oldrel, devel
14-
* win-builder (oldrelease, release, devel)
15-
* R-hub windows-x86_64-release (r-release)
16-
* R-hub windows-x86_64-devel (r-devel)
17-
* R-hub ubuntu-gcc-release (r-release)
18-
* R-hub fedora-clang-devel (r-devel)
29+
* GitHub Actions
30+
* ubuntu 16.04 - R 3.2, 3.3, 3.4, 3.5, 3.6.2
31+
* mac - 3.6.2
32+
* windows - 3.6.2, devel
33+
* win-builder (oldrelease, release)
34+
* R-hub - Windows Server 2008 R2 SP1, R-devel, 32/64 bit (devel)
35+
36+
I did not get an email response from win-builder devel.
37+
38+
1939

2040
## R CMD check results
2141

‎docs/examples.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<title>Examples</title>
1515

16-
<script src="site_libs/header-attrs-2.1.1/header-attrs.js"></script>
16+
<script src="site_libs/header-attrs-2.1/header-attrs.js"></script>
1717
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
1818
<meta name="viewport" content="width=device-width, initial-scale=1" />
1919
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />

‎docs/exercises.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<title>Exercises</title>
1515

16-
<script src="site_libs/header-attrs-2.1.1/header-attrs.js"></script>
16+
<script src="site_libs/header-attrs-2.1/header-attrs.js"></script>
1717
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
1818
<meta name="viewport" content="width=device-width, initial-scale=1" />
1919
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />

‎docs/formats.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<title>Formats</title>
1515

16-
<script src="site_libs/header-attrs-2.1.1/header-attrs.js"></script>
16+
<script src="site_libs/header-attrs-2.1/header-attrs.js"></script>
1717
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
1818
<meta name="viewport" content="width=device-width, initial-scale=1" />
1919
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />

‎docs/index.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<title>Interactive Tutorials for R</title>
1515

16-
<script src="site_libs/header-attrs-2.1.1/header-attrs.js"></script>
16+
<script src="site_libs/header-attrs-2.1/header-attrs.js"></script>
1717
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
1818
<meta name="viewport" content="width=device-width, initial-scale=1" />
1919
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -497,9 +497,10 @@ <h3>Installation</h3>
497497
<h3>Creating a Tutorial</h3>
498498
<p>A tutorial is just a directory that contains a standard R Markdown document with three additional attributes:</p>
499499
<ol style="list-style-type: decimal">
500-
<li>Loads the <strong>learnr</strong> package.</li>
501-
<li>Includes one or more interactive components (exercises, quiz questions, etc.).</li>
502-
<li>Uses the <code>runtime: shiny_prerendered</code> directive in the YAML header.</li>
500+
<li>Loads the <strong>learnr</strong> package,</li>
501+
<li>Includes one or more interactive components (exercises, quiz questions, etc.),</li>
502+
<li>Uses the <code>runtime: shiny_prerendered</code> directive in the YAML header,</li>
503+
<li>Provides a short description in the top-level <code>description:</code> field of the YAML header.</li>
503504
</ol>
504505
<p>The <code>runtime: shiny_prerendered</code> element included in the YAML hints at the underlying implementation of tutorials: they are simply Shiny applications which use an R Markdown document as their user-interface rather than the traditional <code>ui.R</code> file.</p>
505506
<div id="tutorial-format" class="section level4">

‎docs/publishing.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<title>Publishing</title>
1515

16+
<script src="site_libs/header-attrs-2.1/header-attrs.js"></script>
1617
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
1718
<meta name="viewport" content="width=device-width, initial-scale=1" />
1819
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />
@@ -424,7 +425,7 @@ <h2>R Package</h2>
424425
<pre class="r"><code>install.packages(&quot;learnr&quot;)
425426
learnr::run_tutorial(&quot;introduction&quot;, package = &quot;mypackage&quot;)</code></pre>
426427
<div id="exercise-checkers" class="section level3 toc-ignore">
427-
<h3>Exercise Checkers</h3>
428+
<h3 class="toc-ignore">Exercise Checkers</h3>
428429
<p>Note that if your tutorial performs <a href="exercises.html#checking-exercises">exercise checking</a> via an external package then you should be sure to add the package you use for checking as an <code>Imports</code> dependency of your package so it’s installed automatically along with your package.</p>
429430
<p>Note that it’s likely that the <strong>learnr</strong> package will eventually include or depend on another package that provides checking functions. For the time being though explicit installation of external checking packages is a requirement.</p>
430431
</div>

‎docs/questions.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<title>Questions</title>
1515

16-
<script src="site_libs/header-attrs-2.1.1/header-attrs.js"></script>
16+
<script src="site_libs/header-attrs-2.1/header-attrs.js"></script>
1717
<script src="site_libs/jquery-1.11.3/jquery.min.js"></script>
1818
<meta name="viewport" content="width=device-width, initial-scale=1" />
1919
<link href="site_libs/bootstrap-3.3.5/css/cosmo.min.css" rel="stylesheet" />

‎docs/site_libs/header-attrs-2.1.1/header-attrs.js renamed to ‎docs/site_libs/header-attrs-2.1/header-attrs.js

File renamed without changes.

‎revdep/README.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,20 @@
33
|field |value |
44
|:--------|:----------------------------|
55
|version |R version 3.6.1 (2019-07-05) |
6-
|os |macOS Mojave 10.14.6 |
6+
|os |macOS Catalina 10.15.2 |
77
|system |x86_64, darwin15.6.0 |
88
|ui |X11 |
99
|language |(EN) |
1010
|collate |en_US.UTF-8 |
1111
|ctype |en_US.UTF-8 |
1212
|tz |America/New_York |
13-
|date |2019-11-08 |
13+
|date |2020-02-12 |
1414

1515
# Dependencies
1616

17-
|package |old |new |Δ |
18-
|:-------|:-------|:------|:--|
19-
|learnr |0.9.2.1 |0.10.0 |* |
20-
|Rcpp |NA |1.0.2 |* |
17+
|package |old |new |Δ |
18+
|:-------|:------|:------|:--|
19+
|learnr |0.10.0 |0.10.1 |* |
2120

2221
# Revdeps
2322

‎tests/testthat.R

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
library(testthat)
2-
library(learnr)
31

4-
test_check("learnr")
2+
if (requireNamespace("testthat")) {
3+
library(testthat)
4+
library(learnr)
5+
6+
test_check("learnr")
7+
}

0 commit comments

Comments
 (0)