diff --git a/DESCRIPTION b/DESCRIPTION index fafe048e6..058527228 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.8.2.9024 +Version: 1.8.2.9025 Date: 2022-10-03 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index c3e764866..f86578fd7 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.8.2.9024 +# AMR 1.8.2.9025 This version will eventually become v2.0! We're happy to reach a new major milestone soon! diff --git a/data-raw/_install_deps.R b/data-raw/_install_deps.R index d945312bf..89784068f 100644 --- a/data-raw/_install_deps.R +++ b/data-raw/_install_deps.R @@ -32,7 +32,7 @@ install.packages("data-raw/tinytest_1.3.1.tar.gz", dependencies = c("Depends", " install.packages(getwd(), repos = NULL, type = "source") pkg_suggests <- gsub( - "[^a-zA-Z0-9]+", "", + "[^a-zA-Z0-9.]+", "", unlist(strsplit(unlist(packageDescription("AMR", fields = c("Suggests", "Enhances", "LinkingTo") )), diff --git a/inst/tinytest/test-_misc.R b/inst/tinytest/test-_misc.R index 9908041d4..565dcc15e 100755 --- a/inst/tinytest/test-_misc.R +++ b/inst/tinytest/test-_misc.R @@ -41,9 +41,9 @@ expect_equal(strrep(c("A", "B"), c(5, 2)), c("AAAAA", "BB")) expect_equal(trimws(" test "), "test") expect_equal(trimws(" test ", "l"), "test ") expect_equal(trimws(" test ", "r"), " test") -expect_equal(trimws2(" test "), "test") -expect_equal(trimws2(" test ", "l"), "test ") -expect_equal(trimws2(" test ", "r"), " test") +expect_equal(AMR:::trimws2(" test "), "test") +expect_equal(AMR:::trimws2(" test ", "l"), "test ") +expect_equal(AMR:::trimws2(" test ", "r"), " test") expect_warning(AMR:::generate_warning_abs_missing(c("AMP", "AMX"))) expect_warning(AMR:::generate_warning_abs_missing(c("AMP", "AMX"), any = TRUE))