diff --git a/DESCRIPTION b/DESCRIPTION index 21e23126..573a6c00 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 1.7.1.9037 -Date: 2021-08-31 +Version: 1.7.1.9038 +Date: 2021-09-01 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) data analysis and to work with microbial and antimicrobial properties by diff --git a/NEWS.md b/NEWS.md index 7d898e3a..29c592e8 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ -# `AMR` 1.7.1.9037 -## Last updated: 31 August 2021 +# `AMR` 1.7.1.9038 +## Last updated: 1 September 2021 ### Breaking changes * Removed `p_symbol()` and all `filter_*()` functions (except for `filter_first_isolate()`), which were all deprecated in a previous package version diff --git a/R/first_isolate.R b/R/first_isolate.R index 1b5b43f7..39440fb6 100755 --- a/R/first_isolate.R +++ b/R/first_isolate.R @@ -204,7 +204,7 @@ first_isolate <- function(x = NULL, if (is_null_or_grouped_tbl(x)) { # when `x` is left blank, auto determine it (get_current_data() also contains dplyr::cur_data_all()) # is also fix for using a grouped df as input (a dot as first argument) - x <- tryCatch(get_current_data(arg_name = "x", call = -2, requires_cur_data = list(...)$require_cur_data), error = function(e) x) + x <- tryCatch(get_current_data(arg_name = "x", call = -2), error = function(e) x) } meet_criteria(x, allow_class = "data.frame") # also checks dimensions to be >0 meet_criteria(col_date, allow_class = "character", has_length = 1, allow_NULL = TRUE, is_in = colnames(x)) diff --git a/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index d02a0ff5..77b33e0a 100644 Binary files a/data-raw/AMR_latest.tar.gz and b/data-raw/AMR_latest.tar.gz differ diff --git a/docs/articles/datasets.html b/docs/articles/datasets.html index 831092ea..f81cd642 100644 --- a/docs/articles/datasets.html +++ b/docs/articles/datasets.html @@ -44,7 +44,7 @@ AMR (for R) - 1.7.1.9037 + 1.7.1.9038 @@ -190,7 +190,7 @@ @@ -240,12 +240,12 @@ Source: NEWS.md -
-

- Unreleased AMR 1.7.1.9037

-
+
+

+ Unreleased AMR 1.7.1.9038

+

-Last updated: 31 August 2021 +Last updated: 1 September 2021