diff --git a/DESCRIPTION b/DESCRIPTION index 7173ed6d1..673b844e8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9182 +Version: 2.1.1.9183 Date: 2025-03-03 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 09849c597..36cadeaeb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9182 +# AMR 2.1.1.9183 *(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 81eec85e8..522c8fd5d 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.9182 +Version: 2.1.1.9183 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.9182.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9182.tar.gz deleted file mode 100644 index 68c790c1f..000000000 Binary files a/PythonPackage/AMR/dist/amr-2.1.1.9182.tar.gz and /dev/null differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9182-py3-none-any.whl b/PythonPackage/AMR/dist/amr-2.1.1.9183-py3-none-any.whl similarity index 85% rename from PythonPackage/AMR/dist/amr-2.1.1.9182-py3-none-any.whl rename to PythonPackage/AMR/dist/amr-2.1.1.9183-py3-none-any.whl index 418c76091..fbfb5c45a 100644 Binary files a/PythonPackage/AMR/dist/amr-2.1.1.9182-py3-none-any.whl and b/PythonPackage/AMR/dist/amr-2.1.1.9183-py3-none-any.whl differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9183.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9183.tar.gz new file mode 100644 index 000000000..1a291400c Binary files /dev/null and b/PythonPackage/AMR/dist/amr-2.1.1.9183.tar.gz differ diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index 3bc9a52b7..eef73c0f9 100644 --- a/PythonPackage/AMR/setup.py +++ b/PythonPackage/AMR/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages setup( name='AMR', - version='2.1.1.9182', + version='2.1.1.9183', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/data-raw/gpt_training_text_v2.1.1.9182.txt b/data-raw/gpt_training_text_v2.1.1.9183.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9182.txt rename to data-raw/gpt_training_text_v2.1.1.9183.txt index 183b558c1..216ec51b7 100644 --- a/data-raw/gpt_training_text_v2.1.1.9182.txt +++ b/data-raw/gpt_training_text_v2.1.1.9183.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.9182. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9183. 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-_misc.R b/tests/testthat/test-_misc.R index 4092fa79b..a69052fd9 100755 --- a/tests/testthat/test-_misc.R +++ b/tests/testthat/test-_misc.R @@ -67,10 +67,15 @@ check_df <- function(check_element, return_val = 0) { } df <- example_isolates[, check_df("x")] -expect_true(is_right, info = "the environmental data cannot be found for base/x") +expect_true(is_right, info = "the environmental data cannot be found for base/x (1)") -df <- example_isolates[c(1:3), check_df("x")] -expect_true(is_right, info = "the environmental data cannot be found for base/x") +if (getRversion() < "4.0.0") { + df <- example_isolates[c(1:3), check_df("xx")] + expect_true(is_right, info = "the environmental data cannot be found for base/xx") +} else { + df <- example_isolates[c(1:3), check_df("x")] + expect_true(is_right, info = "the environmental data cannot be found for base/x (2)") +} if (AMR:::pkg_is_available("dplyr", min_version = "1.0.0", also_load = TRUE)) { df <- example_isolates %>% select(mo, check_df("data123"))