Skip to content

Commit

Permalink
fixed swirldev#434
Browse files Browse the repository at this point in the history
  • Loading branch information
seankross committed Jun 22, 2016
1 parent 248d285 commit 4aed464
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
7 changes: 3 additions & 4 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.1
Version: 2.4.2
License: MIT + file LICENSE
Authors@R: c(
person("Sean", "Kross", email = "[email protected]", role = c("aut", "cre")),
Expand All @@ -15,16 +15,15 @@ Authors@R: c(
person("Wush", "Wu", role = "ctb")
)
Depends:
R (>= 3.0.2)
R (>= 3.1.0)
Imports:
stringr,
testthat,
testthat (>= 1.0.2),
httr (>= 1.1.0),
yaml,
RCurl,
digest,
tools,
utils,
methods
Suggests:
stringi
Expand Down
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export(swirl_options)
export(uninstall_all_courses)
export(uninstall_course)
export(zip_course)
import(utils)
importFrom(RCurl,base64)
importFrom(RCurl,getForm)
importFrom(RCurl,postForm)
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# swirl 2.4.2

* Script questions behave more appropriately in RStudio. (#434, thank you @jimhester)

# swirl 2.4.1

* Added new answer test: `calculates_same_value()`.
Expand Down
5 changes: 5 additions & 0 deletions R/global.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
utils::globalVariables(c("URLencode", "browseURL", "capture.output",
"file.edit", "getS3method", "head", "install.packages",
"packageVersion", "read.csv", "select.list", "sessionInfo",
"setTxtProgressBar", "tail", "txtProgressBar", "unzip",
"zip"))
1 change: 0 additions & 1 deletion R/swirl.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
#' @export
#' @importFrom stringr str_c str_trim str_split str_length
#' @importFrom stringr str_detect str_locate fixed str_split_fixed
#' @import utils
#' @importFrom methods is
#' @examples
#' \dontrun{
Expand Down
11 changes: 3 additions & 8 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
## Release summary

This is the first attempted CRAN release of swirl 2.4.1.
This patch is in response to a message from Brian Ripely
informing me that a test fails in the Latin-1 locale, and a
message from Hadley Wickham informing me that the new
version of testthat introduces breaking changes to swirl.
This patch should resolve both of those issues.
This is the first attempted CRAN release of swirl 2.4.2.

## Test environments

* local OSX Yosemite install, R 3.2.4
* Ubuntu 12.04 (on travis-ci), R 3.2.4
* local OSX Yosemite install, R 3.3.0
* Ubuntu 12.04 (on travis-ci), R 3.3.0
* win-builder (devel and release)

## R CMD check results
Expand Down
1 change: 0 additions & 1 deletion revdep/.Rapp.history

This file was deleted.

Binary file modified revdep/checks.rds
Binary file not shown.

0 comments on commit 4aed464

Please sign in to comment.