diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 1189e961..a6134d9a 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -65,7 +65,7 @@ jobs: - {os: ubuntu-20.04, r: '3.6', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - {os: ubuntu-20.04, r: '3.5', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - {os: ubuntu-20.04, r: '3.4', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - - {os: ubuntu-20.04, r: '3.3', allowfail: false rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} + - {os: ubuntu-20.04, r: '3.3', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} # - {os: ubuntu-20.04, r: '3.2', allowfail: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} # - {os: ubuntu-20.04, r: '3.1', allowfail: true, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} - {os: ubuntu-20.04, r: '3.0', allowfail: false, rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"} diff --git a/DESCRIPTION b/DESCRIPTION index aad0d6a5..bf2704ef 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 1.6.0.9003 +Version: 1.6.0.9004 Date: 2021-04-16 Title: Antimicrobial Resistance Data Analysis Authors@R: c( diff --git a/NEWS.md b/NEWS.md index 680681da..fd7d3e95 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 1.6.0.9003 +# AMR 1.6.0.9004 ## Last updated: 16 April 2021 ### New diff --git a/R/aa_helper_functions.R b/R/aa_helper_functions.R index d5275305..cdf69da1 100755 --- a/R/aa_helper_functions.R +++ b/R/aa_helper_functions.R @@ -217,10 +217,11 @@ is_valid_regex <- function(x) { FUN = function(y) any(y %in% c("$", "(", ")", "*", "+", "-", ".", "?", "[", "]", "^", "{", "|", "}", "\\"), - na.rm = TRUE)), + na.rm = TRUE), + USE.NAMES = FALSE), error = function(e) rep(TRUE, length(x))) regex_valid <- vapply(FUN.VALUE = logical(1), - X = c("[.", "."), + X = x, FUN = function(y) !"try-error" %in% class(try(grepl(y, ""), silent = TRUE)), USE.NAMES = FALSE) diff --git a/R/sysdata.rda b/R/sysdata.rda index 58481e53..7a9cd5ec 100644 Binary files a/R/sysdata.rda and b/R/sysdata.rda differ diff --git a/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index 7f046d33..400006f7 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 f45fb96e..c10270ff 100644 --- a/docs/404.html +++ b/docs/404.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004 diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html index 85ccaa27..008229c2 100644 --- a/docs/LICENSE-text.html +++ b/docs/LICENSE-text.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004 diff --git a/docs/articles/index.html b/docs/articles/index.html index 9466b814..9bd73509 100644 --- a/docs/articles/index.html +++ b/docs/articles/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004 diff --git a/docs/authors.html b/docs/authors.html index 42946a3d..238fbb91 100644 --- a/docs/authors.html +++ b/docs/authors.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004 diff --git a/docs/index.html b/docs/index.html index 1cbb3040..ac15e3ae 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,7 +42,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004 diff --git a/docs/news/index.html b/docs/news/index.html index 1ceaf914..f4dfe403 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004 @@ -236,9 +236,9 @@ Source: NEWS.md -
-

-AMR 1.6.0.9003 Unreleased +
+

+AMR 1.6.0.9004 Unreleased

diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml index 30a6f11a..1031ab5e 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-04-16T09:40Z +last_built: 2021-04-16T10:00Z 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 5ce5bed9..d3b11412 100644 --- a/docs/reference/index.html +++ b/docs/reference/index.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004

diff --git a/docs/survey.html b/docs/survey.html index 9a6bc305..44d3120f 100644 --- a/docs/survey.html +++ b/docs/survey.html @@ -81,7 +81,7 @@ AMR (for R) - 1.6.0.9003 + 1.6.0.9004