Skip to content

Commit

Permalink
Merge pull request swirldev#781 from swirldev/dev
Browse files Browse the repository at this point in the history
Swirl 2.4.5
  • Loading branch information
seankross committed Jan 16, 2020
2 parents 466dddc + 6900b27 commit 25938d2
Show file tree
Hide file tree
Showing 30 changed files with 313 additions and 236 deletions.
5 changes: 2 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Description: Use the R console as an interactive learning
environment. Users receive immediate feedback as they are guided through
self-paced lessons in data science and R programming.
URL: http://swirlstats.com
Version: 2.4.4
Version: 2.4.5
License: MIT + file LICENSE
Authors@R: c(
person("Sean", "Kross", email = "[email protected]", role = c("aut", "cre")),
Expand All @@ -29,5 +29,4 @@ Suggests:
stringi
Encoding: UTF-8
LazyData: true
Roxygen: list(wrap = FALSE)
RoxygenNote: 6.1.1
RoxygenNote: 7.0.2
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# swirl 2.4.5

* Thank you @HenrikBengtsson for fixing a warning when
`warnPartialMatchArgs=TRUE`. (#779)

# swirl 2.4.4

* Fixed encoding test which was failing on CRAN (debian-clang-devel).
Expand Down
2 changes: 1 addition & 1 deletion R/menu.R
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ mainMenu.default <- function(e){
if(!is(e,"datacamp")) {
e$pbar <- txtProgressBar(style=3)
}
e$pbar_seq <- seq(0, 1, length=nrow(e$les))
e$pbar_seq <- seq(0, 1, length.out=nrow(e$les))

# expr, val, ok, and vis should have been set by the callback.
# The lesson's current row - could start after 1 if in 'test' mode
Expand Down
6 changes: 3 additions & 3 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Release summary

This is the first attempted CRAN release of swirl 2.4.4.
This is the first attempted CRAN release of swirl 2.4.5.

## Test environments

* local macOS Sierra install, R 3.6.0
* Ubuntu 14.04 (on travis-ci), R 3.6.0, R 3.5.3, R-devel.
* local macOS Sierra install, R 3.6.1
* Ubuntu 16.04 (on travis-ci), R 3.6.1, R 3.5.3, R-devel.
* win-builder (release)

## R CMD check results
Expand Down
20 changes: 12 additions & 8 deletions man/AnswerTests.Rd

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

22 changes: 12 additions & 10 deletions man/InstallCourses.Rd

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

20 changes: 12 additions & 8 deletions man/any_of_exprs.Rd

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

20 changes: 12 additions & 8 deletions man/calculates_same_value.Rd

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

20 changes: 12 additions & 8 deletions man/expr_creates_var.Rd

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

20 changes: 12 additions & 8 deletions man/expr_identical_to.Rd

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

21 changes: 12 additions & 9 deletions man/expr_is_a.Rd

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

20 changes: 12 additions & 8 deletions man/expr_uses_func.Rd

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

20 changes: 12 additions & 8 deletions man/func_of_newvar_equals.Rd

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

22 changes: 12 additions & 10 deletions man/install_course.Rd

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

22 changes: 12 additions & 10 deletions man/install_course_directory.Rd

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

22 changes: 12 additions & 10 deletions man/install_course_dropbox.Rd

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

Loading

0 comments on commit 25938d2

Please sign in to comment.