From 755e6f43b7ba505da270ae4b1502df4cde759e04 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Wed, 19 Mar 2025 16:06:23 +0100 Subject: [PATCH] (v2.1.1.9219) unit tests --- DESCRIPTION | 2 +- NEWS.md | 2 +- data-raw/_pre_commit_checks.R | 5 +++-- ...ext_v2.1.1.9218.txt => gpt_training_text_v2.1.1.9219.txt} | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename data-raw/{gpt_training_text_v2.1.1.9218.txt => gpt_training_text_v2.1.1.9219.txt} (99%) diff --git a/DESCRIPTION b/DESCRIPTION index 59ae6ab9e..124c25b80 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9218 +Version: 2.1.1.9219 Date: 2025-03-19 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 2f613fb1c..b8314163c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9218 +# AMR 2.1.1.9219 *(this beta version will eventually become v3.0. We're happy to reach a new major milestone soon, which will be all about the new One Health support! Install this beta using [the instructions here](https://msberends.github.io/AMR/#latest-development-version).)* diff --git a/data-raw/_pre_commit_checks.R b/data-raw/_pre_commit_checks.R index c9ae708e2..5670da8c5 100644 --- a/data-raw/_pre_commit_checks.R +++ b/data-raw/_pre_commit_checks.R @@ -628,7 +628,8 @@ suppressMessages(set_AMR_locale("English")) files_changed <- function(paths = "^(R|data)/") { tryCatch({ - changed_files <- system("git diff --name-only", intern = TRUE) + changed_files <- system("git status", intern = TRUE) + changed_files <- unlist(strsplit(changed_files, " ")) any(changed_files %like% paths) }, error = function(e) TRUE) } @@ -641,7 +642,7 @@ if (files_changed()) { # Style pkg --------------------------------------------------------------- if (files_changed(paths = "^(R|tests)/")) { - sethis::ui_info("Styling package") + usethis::ui_info("Styling package") styler::style_pkg(include_roxygen_examples = FALSE, exclude_dirs = list.dirs(full.names = FALSE, recursive = FALSE)[!list.dirs(full.names = FALSE, recursive = FALSE) %in% c("R", "tests")]) } diff --git a/data-raw/gpt_training_text_v2.1.1.9218.txt b/data-raw/gpt_training_text_v2.1.1.9219.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9218.txt rename to data-raw/gpt_training_text_v2.1.1.9219.txt index f95ee1aec..570510216 100644 --- a/data-raw/gpt_training_text_v2.1.1.9218.txt +++ b/data-raw/gpt_training_text_v2.1.1.9219.txt @@ -1,6 +1,6 @@ This knowledge base contains all context you must know about the AMR package for R. You are a GPT trained to be an assistant for the AMR package in R. You are an incredible R specialist, especially trained in this package and in the tidyverse. -First and foremost, you are trained on version 2.1.1.9218. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9219. Remember this whenever someone asks which AMR package version you’re at. Below are the contents of the NAMESPACE file, the index.md file, and all the man/*.Rd files (documentation) in the package. Every file content is split using 100 hypens. ----------------------------------------------------------------------------------------------------