From d84033bbcbb7b4e1d24827f0ce608b145f55b365 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Sat, 1 Feb 2025 11:10:42 +0100 Subject: [PATCH] (v2.1.1.9139) unit test --- DESCRIPTION | 4 ++-- NEWS.md | 2 +- PythonPackage/AMR/AMR.egg-info/PKG-INFO | 2 +- ...ny.whl => AMR-2.1.1.9139-py3-none-any.whl} | Bin 10166 -> 10167 bytes PythonPackage/AMR/dist/amr-2.1.1.9138.tar.gz | Bin 10013 -> 0 bytes PythonPackage/AMR/dist/amr-2.1.1.9139.tar.gz | Bin 0 -> 10004 bytes PythonPackage/AMR/setup.py | 2 +- ....txt => gpt_training_text_v2.1.1.9139.txt} | 2 +- tests/testthat/test-zzz.R | 7 +------ 9 files changed, 7 insertions(+), 12 deletions(-) rename PythonPackage/AMR/dist/{AMR-2.1.1.9138-py3-none-any.whl => AMR-2.1.1.9139-py3-none-any.whl} (52%) delete mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9138.tar.gz create mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9139.tar.gz rename data-raw/{gpt_training_text_v2.1.1.9138.txt => gpt_training_text_v2.1.1.9139.txt} (99%) diff --git a/DESCRIPTION b/DESCRIPTION index 65d02f4d8..839ad37c9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: AMR -Version: 2.1.1.9138 -Date: 2025-01-31 +Version: 2.1.1.9139 +Date: 2025-02-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 ac220914e..7847a9919 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9138 +# AMR 2.1.1.9139 *(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/PythonPackage/AMR/AMR.egg-info/PKG-INFO b/PythonPackage/AMR/AMR.egg-info/PKG-INFO index ebb640a7b..6048f01fd 100644 --- a/PythonPackage/AMR/AMR.egg-info/PKG-INFO +++ b/PythonPackage/AMR/AMR.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.2 Name: AMR -Version: 2.1.1.9138 +Version: 2.1.1.9139 Summary: A Python wrapper for the AMR R package Home-page: https://github.com/msberends/AMR Author: Matthijs Berends diff --git a/PythonPackage/AMR/dist/AMR-2.1.1.9138-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9139-py3-none-any.whl similarity index 52% rename from PythonPackage/AMR/dist/AMR-2.1.1.9138-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9139-py3-none-any.whl index 01c8f42f5841e93e05503e1c432ee1d12612e3f6..5e476bb59c826bc5685ce1a5a96f1fc8104e6c9b 100644 GIT binary patch delta 4127 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�v{=;?5J7Kkdm5w?6 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 literal 0 HcmV?d00001 diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index a88e40267..64c5d109a 100644 --- a/PythonPackage/AMR/setup.py +++ b/PythonPackage/AMR/setup.py @@ -2,7 +2,7 @@ setup( name='AMR', - version='2.1.1.9138', + version='2.1.1.9139', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/data-raw/gpt_training_text_v2.1.1.9138.txt b/data-raw/gpt_training_text_v2.1.1.9139.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9138.txt rename to data-raw/gpt_training_text_v2.1.1.9139.txt index d379e4344..ac6b904b5 100644 --- a/data-raw/gpt_training_text_v2.1.1.9138.txt +++ b/data-raw/gpt_training_text_v2.1.1.9139.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.9138. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9139. Remember this whenever someone asks which AMR package version you’re at. Below are the contents of the file, the file, and all the files (documentation) in the package. Every file content is split using 100 hypens. ---------------------------------------------------------------------------------------------------- diff --git a/tests/testthat/test-zzz.R b/tests/testthat/test-zzz.R index bdcb59210..57c7b0a2b 100644 --- a/tests/testthat/test-zzz.R +++ b/tests/testthat/test-zzz.R @@ -141,12 +141,7 @@ call_functions <- c( import_functions <- c(import_functions, call_functions) -if (AMR:::pkg_is_available("desc")) { - suggests <- desc::desc(".")$get_deps() - suggests <- suggests[which(suggests$type == "Suggests"), ]$package -} else { - suggests <- import_functions -} +suggests <- strsplit(utils::packageDescription(pkg = ".", lib.loc = ".", fields = "Suggests"), "[,\n ]+")[[1]] for (i in seq_len(length(import_functions))) { fn <- names(import_functions)[i] pkg <- unname(import_functions[i])