diff --git a/DESCRIPTION b/DESCRIPTION index 7b2ccead..226376e6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.2.0.9008 +Version: 1.2.0.9009 Date: 2020-06-17 Title: Antimicrobial Resistance Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index a146eda0..78aa761e 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.2.0.9008 +# AMR 1.2.0.9009 ## Last updated: 17-Jun-2020 ### New diff --git a/R/aa_helper_functions.R b/R/aa_helper_functions.R index 64cf2817..bea6f5b3 100755 --- a/R/aa_helper_functions.R +++ b/R/aa_helper_functions.R @@ -182,14 +182,14 @@ search_type_in_df <- function(x, type) { stopifnot_installed_package <- function(package) { # no "utils::installed.packages()" since it requires non-staged install since R 3.6.0 # https://developer.r-project.org/Blog/public/2019/02/14/staged-install/index.html - sapply(package, function(x) - tryCatch(get(".packageName", envir = asNamespace(x)), + sapply(package, function(pkg) + tryCatch(get(".packageName", envir = asNamespace(pkg)), error = function(e) { if (package == "rstudioapi") { stop("This function only works in RStudio.", call. = FALSE) - } else { - stop("package '", x, "' required but not installed.", - "\nTry to install it with: install.packages(\"", x, "\")", + } else if (pkg != "base") { + stop("package '", pkg, "' required but not installed.", + "\nTry to install it with: install.packages(\"", pkg, "\")", call. = FALSE) } })) diff --git a/docs/404.html b/docs/404.html index ae57627a..d30ea81b 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index c07ef543..21e72f28 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009 diff --git a/docs/articles/index.html b/docs/articles/index.html index 7e84b631..ee5c9979 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009 diff --git a/docs/authors.html b/docs/authors.html index c2d62f4f..30a5cfd6 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009 diff --git a/docs/index.html b/docs/index.html index 58b93b6b..5190d0b7 100644 --- a/docs/index.html +++ b/docs/index.html @@ -43,7 +43,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009 diff --git a/docs/news/index.html b/docs/news/index.html index 2c5c2581..5c35cf47 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009 @@ -229,9 +229,9 @@ Source: NEWS.md -
-

-AMR 1.2.0.9008 Unreleased +
+

+AMR 1.2.0.9009 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 2869d661..962e71cc 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -10,7 +10,7 @@ articles: WHONET: WHONET.html benchmarks: benchmarks.html resistance_predict: resistance_predict.html -last_built: 2020-06-17T13:03Z +last_built: 2020-06-17T14:24Z urls: reference: https://msberends.gitlab.io/AMR/reference article: https://msberends.gitlab.io/AMR/articles diff --git a/docs/reference/index.html b/docs/reference/index.html index d8ad6651..6308ebbe 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.2.0.9008 + 1.2.0.9009