Skip to content

Commit

Permalink
Merge pull request #37 from getwilds/dev
Browse files Browse the repository at this point in the history
proofr v0.4.0 Updates
  • Loading branch information
tefirman authored Dec 3, 2024
2 parents 04a154a + f8f2aed commit 6cc21e3
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: proofr
Title: Client for the PROOF API
Version: 0.3.0.91
Version: 0.4.0
Authors@R:
person("Scott", "Chamberlain", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0003-1444-9135"))
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# proofr v0.4.0

* Bumping timeout from 5 seconds to 20 seconds (@sckott in [direct commit](https://github.com/getwilds/proofr/commit/cbe9062fd73e61992b46035e7ac2241cd8de2541))

# proofr v0.3.0

* Swapping `httr` for `httr2` (@sckott in [#25](https://github.com/getwilds/proofr/pull/25))
Expand Down
2 changes: 1 addition & 1 deletion R/onLoad.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ proofr_env <- new.env() # nocov start

.onLoad <- function(libname, pkgname) {
# use the same timezone throughout the package
proofr_env$timeout_sec <<- 5
proofr_env$timeout_sec <<- 20
} # nocov end
2 changes: 1 addition & 1 deletion R/status.R
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#' this function again until you get the server URL
#' @section Timeout:
#' If the PROOF API is unavailable, this function will timeout after
#' 5 seconds. Contact the package maintainer if you get a timeout error.
#' 20 seconds. Contact the package maintainer if you get a timeout error.
#' See [proof_timeout()].
#' @return A list with fields:
#' - `canJobStart` (logical): can a job to make a Cromwell server be started?
Expand Down
4 changes: 2 additions & 2 deletions R/timeout.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
#'
#' @export
#' @param sec (integer/numeric) number of seconds after which
#' requests will timeout. default: 10 sec (10000 ms)
#' requests will timeout. default: 20 sec (20000 ms)
#' @references <https://httr.r-lib.org/reference/timeout.html>
#' @return nothing, side effect of setting the timeout for requests
proof_timeout <- function(sec = 10) {
proof_timeout <- function(sec = 20) {
assert(sec, c("integer", "numeric"))
proofr_env$timeout_sec <- sec
}
2 changes: 1 addition & 1 deletion man/proof_authenticate.Rd

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

2 changes: 1 addition & 1 deletion man/proof_cancel.Rd

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

2 changes: 1 addition & 1 deletion man/proof_start.Rd

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

2 changes: 1 addition & 1 deletion man/proof_status.Rd

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

4 changes: 2 additions & 2 deletions man/proof_timeout.Rd

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

0 comments on commit 6cc21e3

Please sign in to comment.