diff --git a/DESCRIPTION b/DESCRIPTION index b867454f..2ec4a7fc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.6.0.9053 +Version: 1.6.0.9054 Date: 2021-05-20 Title: Antimicrobial Resistance Data Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 41c1e892..d7e2f8c8 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# `AMR` 1.6.0.9053 +# `AMR` 1.6.0.9054 ## Last updated: 20 May 2021 ### Breaking change diff --git a/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index c1d5b7d8..fdc77abe 100644 Binary files a/data-raw/AMR_latest.tar.gz and b/data-raw/AMR_latest.tar.gz differ diff --git a/docs/404.html b/docs/404.html index 1018477c..4fcbaa19 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 4543debd..8c3b6eea 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 diff --git a/docs/articles/datasets.html b/docs/articles/datasets.html index 7a0a3853..4317d1e8 100644 --- a/docs/articles/datasets.html +++ b/docs/articles/datasets.html @@ -39,7 +39,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 diff --git a/docs/articles/index.html b/docs/articles/index.html index 3bdfde7c..a7f2f3d7 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 diff --git a/docs/authors.html b/docs/authors.html index 7c1c9bb9..8b381823 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 diff --git a/docs/index.html b/docs/index.html index 33a9dc76..ffa67844 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 diff --git a/docs/news/index.html b/docs/news/index.html index 6b22b2cb..733f5f8a 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054 @@ -236,9 +236,9 @@ Source: NEWS.md -
-

- Unreleased AMR 1.6.0.9053

+
+

+ Unreleased AMR 1.6.0.9054

Last updated: 20 May 2021 diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index cc4ee11b..d0b8781e 100644 --- a/docs/pkgdown.yml +++ b/docs/pkgdown.yml @@ -12,7 +12,7 @@ articles: datasets: datasets.html resistance_predict: resistance_predict.html welcome_to_AMR: welcome_to_AMR.html -last_built: 2021-05-20T11:41Z +last_built: 2021-05-20T13:05Z urls: reference: https://msberends.github.io/AMR//reference article: https://msberends.github.io/AMR//articles diff --git a/docs/reference/index.html b/docs/reference/index.html index 30b14fcc..eeb3a47a 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054

diff --git a/docs/survey.html b/docs/survey.html index f4300783..471a406c 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9053 + 1.6.0.9054
diff --git a/inst/tinytest/test-eucast_rules.R b/inst/tinytest/test-eucast_rules.R index 2549d175..a60989fa 100755 --- a/inst/tinytest/test-eucast_rules.R +++ b/inst/tinytest/test-eucast_rules.R @@ -32,7 +32,7 @@ expect_equal(colnames(AMR:::eucast_rules_file), "reference.version", "note")) MOs_mentioned <- unique(AMR:::eucast_rules_file$this_value) -MOs_mentioned <- sort(trimws(unlist(strsplit(MOs_mentioned[!AMR:::is_valid_regex(MOs_mentioned)], ",", fixed = TRUE)))) +MOs_mentioned <- sort(AMR:::trimws(unlist(strsplit(MOs_mentioned[!AMR:::is_valid_regex(MOs_mentioned)], ",", fixed = TRUE)))) MOs_test <- suppressWarnings(suppressMessages(mo_name(MOs_mentioned))) expect_true(length(MOs_mentioned[MOs_test != MOs_mentioned]) == 0) diff --git a/tests/tinytest.R b/tests/tinytest.R index c7284371..af64a18d 100644 --- a/tests/tinytest.R +++ b/tests/tinytest.R @@ -40,7 +40,7 @@ if (identical(Sys.getenv("R_RUN_TINYTEST"), "true")) { if (pkg_is_available("tinytest")) { library(AMR) out <- test_package("AMR", verbose = FALSE) - print(attributes(out)$duration) + cat(attributes(out)$duration, "\n") print(summary(out)) } }