diff --git a/DESCRIPTION b/DESCRIPTION index 406a8dce..f9a9748e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 1.7.1.9028 -Date: 2021-08-20 +Version: 1.7.1.9029 +Date: 2021-08-21 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 ce9b1a51..aa7a6f4a 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,5 @@ -# `AMR` 1.7.1.9028 -## Last updated: 20 August 2021 +# `AMR` 1.7.1.9029 +## Last updated: 21 August 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/data-raw/AMR_latest.tar.gz b/data-raw/AMR_latest.tar.gz index 9ef76780..1028ad19 100644 Binary files a/data-raw/AMR_latest.tar.gz and b/data-raw/AMR_latest.tar.gz differ diff --git a/data-raw/_install_deps.R b/data-raw/_install_deps.R index 26a1b61b..6e9fcc6f 100644 --- a/data-raw/_install_deps.R +++ b/data-raw/_install_deps.R @@ -39,7 +39,11 @@ if (length(to_install) == 0) { } for (i in seq_len(length(to_install))) { cat("Installing package", to_install[i], "\n") - tryCatch(install.packages(to_install[i], repos = "https://cran.rstudio.com/", dependencies = c("Depends", "Imports"), quiet = FALSE), + tryCatch(install.packages(to_install[i], + type = ifelse(.Platform$OS.type == "unix", "source", "binary"), + repos = "https://cran.rstudio.com/", + dependencies = c("Depends", "Imports"), + quiet = FALSE), # message = function(m) invisible(), warning = function(w) message(w$message), error = function(e) message(e$message)) @@ -51,9 +55,10 @@ if (length(to_update) == 0) { message("\nNothing to update\n") } for (i in seq_len(length(to_update))) { - cat("Updating package", to_update[i], "\n") + cat("Updating package '", to_update[i], "' v", as.character(packageVersion(to_update[i])), "\n", sep = "") tryCatch(update.packages(to_update[i], repos = "https://cran.rstudio.com/", ask = FALSE), # message = function(m) invisible(), warning = function(w) message(w$message), error = function(e) message(e$message)) + cat("Updated to '", to_update[i], "' v", as.character(packageVersion(to_update[i])), "\n", sep = "") } diff --git a/docs/articles/datasets.html b/docs/articles/datasets.html index c2098e31..d6ef5fdd 100644 --- a/docs/articles/datasets.html +++ b/docs/articles/datasets.html @@ -44,7 +44,7 @@ AMR (for R) - 1.7.1.9028 + 1.7.1.9029 @@ -190,7 +190,7 @@ @@ -240,12 +240,12 @@ Source: NEWS.md -
-

- Unreleased AMR 1.7.1.9028

-
+
+

+ Unreleased AMR 1.7.1.9029

+

-Last updated: 20 August 2021 +Last updated: 21 August 2021