diff --git a/DESCRIPTION b/DESCRIPTION index 26182f899..2fa608c8f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9148 +Version: 2.1.1.9149 Date: 2025-02-15 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 151fa5e78..8b8082b61 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9148 +# AMR 2.1.1.9149 *(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 e17678be9..eda33c69d 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.9148 +Version: 2.1.1.9149 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.9148-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9149-py3-none-any.whl similarity index 52% rename from PythonPackage/AMR/dist/AMR-2.1.1.9148-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9149-py3-none-any.whl index 768ffcf4b..f3c5ebaaf 100644 Binary files a/PythonPackage/AMR/dist/AMR-2.1.1.9148-py3-none-any.whl and b/PythonPackage/AMR/dist/AMR-2.1.1.9149-py3-none-any.whl differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9148.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9148.tar.gz deleted file mode 100644 index 89ae78ab1..000000000 Binary files a/PythonPackage/AMR/dist/amr-2.1.1.9148.tar.gz and /dev/null differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9149.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9149.tar.gz new file mode 100644 index 000000000..ee038cc25 Binary files /dev/null and b/PythonPackage/AMR/dist/amr-2.1.1.9149.tar.gz differ diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index 5d72d1b42..da3a24ee0 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.9148', + version='2.1.1.9149', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/R/plotting.R b/R/plotting.R index d7255e4e8..775ed96f7 100755 --- a/R/plotting.R +++ b/R/plotting.R @@ -189,8 +189,8 @@ #' if (require("ggplot2")) { #' plain + #' scale_y_mic(mic_range = c(0.005, 32), name = "Our MICs!") + -#' scale_colour_sir(language = "el", eucast_I = FALSE, -#' name = "In Greek!") +#' scale_colour_sir(language = "nl", eucast_I = FALSE, +#' name = "In Dutch!") #' } #' #' diff --git a/data-raw/gpt_training_text_v2.1.1.9148.txt b/data-raw/gpt_training_text_v2.1.1.9149.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9148.txt rename to data-raw/gpt_training_text_v2.1.1.9149.txt index ab6abb81e..673fa3a00 100644 --- a/data-raw/gpt_training_text_v2.1.1.9148.txt +++ b/data-raw/gpt_training_text_v2.1.1.9149.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.9148. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9149. 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. ---------------------------------------------------------------------------------------------------- @@ -7635,8 +7635,8 @@ if (require("ggplot2")) { if (require("ggplot2")) { plain + scale_y_mic(mic_range = c(0.005, 32), name = "Our MICs!") + - scale_colour_sir(language = "el", eucast_I = FALSE, - name = "In Greek!") + scale_colour_sir(language = "nl", eucast_I = FALSE, + name = "In Dutch!") } diff --git a/man/plot.Rd b/man/plot.Rd index 6f6ad6e09..a661cdadb 100644 --- a/man/plot.Rd +++ b/man/plot.Rd @@ -312,8 +312,8 @@ if (require("ggplot2")) { if (require("ggplot2")) { plain + scale_y_mic(mic_range = c(0.005, 32), name = "Our MICs!") + - scale_colour_sir(language = "el", eucast_I = FALSE, - name = "In Greek!") + scale_colour_sir(language = "nl", eucast_I = FALSE, + name = "In Dutch!") }