diff --git a/DESCRIPTION b/DESCRIPTION index 47a4da664..4c2b3fc3c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9136 +Version: 2.1.1.9137 Date: 2025-01-31 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index bc38b64dd..ce22e36da 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9136 +# AMR 2.1.1.9137 *(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 7fcd186cd..36cb78a22 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.9136 +Version: 2.1.1.9137 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.9136-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9137-py3-none-any.whl similarity index 85% rename from PythonPackage/AMR/dist/AMR-2.1.1.9136-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9137-py3-none-any.whl index a3d1b1be3..dd2332a73 100644 Binary files a/PythonPackage/AMR/dist/AMR-2.1.1.9136-py3-none-any.whl and b/PythonPackage/AMR/dist/AMR-2.1.1.9137-py3-none-any.whl differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9136.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9136.tar.gz deleted file mode 100644 index 9bde8125e..000000000 Binary files a/PythonPackage/AMR/dist/amr-2.1.1.9136.tar.gz and /dev/null differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9137.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9137.tar.gz new file mode 100644 index 000000000..a01684bf8 Binary files /dev/null and b/PythonPackage/AMR/dist/amr-2.1.1.9137.tar.gz differ diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index b3be73311..e8bf942bc 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.9136', + version='2.1.1.9137', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/R/aa_helper_functions.R b/R/aa_helper_functions.R index b32954fe4..2378f68eb 100644 --- a/R/aa_helper_functions.R +++ b/R/aa_helper_functions.R @@ -1173,7 +1173,7 @@ has_colour <- function() { # disable on emacs, which only supports 8 colours return(FALSE) } - has_color <- import_fn("has_color", "crayon") + has_color <- import_fn("has_color", "crayon", error_on_fail = FALSE) !is.null(has_color) && isTRUE(has_color()) } diff --git a/data-raw/gpt_training_text_v2.1.1.9136.txt b/data-raw/gpt_training_text_v2.1.1.9137.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9136.txt rename to data-raw/gpt_training_text_v2.1.1.9137.txt index 8b7775c20..c148bacba 100644 --- a/data-raw/gpt_training_text_v2.1.1.9136.txt +++ b/data-raw/gpt_training_text_v2.1.1.9137.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.9136. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9137. 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. ----------------------------------------------------------------------------------------------------