From c7af397edf153f432682d2ceca4ae9357f53cb1c Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Fri, 7 Mar 2025 23:25:50 +0100 Subject: [PATCH] (v2.1.1.9189) Add the awesome Aislinn Cook --- DESCRIPTION | 3 ++- NEWS.md | 10 +++++----- PythonPackage/AMR/AMR.egg-info/PKG-INFO | 2 +- PythonPackage/AMR/dist/amr-2.1.1.9188.tar.gz | Bin 10087 -> 0 bytes ...ny.whl => amr-2.1.1.9189-py3-none-any.whl} | Bin 10281 -> 10281 bytes PythonPackage/AMR/dist/amr-2.1.1.9189.tar.gz | Bin 0 -> 10091 bytes PythonPackage/AMR/setup.py | 2 +- ....txt => gpt_training_text_v2.1.1.9189.txt} | 3 ++- man/AMR.Rd | 1 + pkgdown/extra.js | 7 +++++-- 10 files changed, 17 insertions(+), 11 deletions(-) delete mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9188.tar.gz rename PythonPackage/AMR/dist/{amr-2.1.1.9188-py3-none-any.whl => amr-2.1.1.9189-py3-none-any.whl} (52%) create mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9189.tar.gz rename data-raw/{gpt_training_text_v2.1.1.9188.txt => gpt_training_text_v2.1.1.9189.txt} (99%) diff --git a/DESCRIPTION b/DESCRIPTION index ebd6c8f5e..3d3eab7eb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9188 +Version: 2.1.1.9189 Date: 2025-03-07 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) @@ -9,6 +9,7 @@ Authors@R: c( person(given = c("Matthijs", "S."), family = "Berends", role = c("aut", "cre"), comment = c(ORCID = "0000-0001-7620-1800"), email = "m.s.berends@umcg.nl"), person(given = c("Dennis"), family = "Souverein", role = c("aut", "ctb"), comment = c(ORCID = "0000-0003-0455-0336")), person(given = c("Erwin", "E.", "A."), family = "Hassing", role = c("aut", "ctb")), + person(given = c("Aislinn"), family = "Cook", role = "ctb", comment = c(ORCID = "0000-0002-9189-7815")), person(given = c("Andrew", "P."), family = "Norgan", role = "ctb", comment = c(ORCID = "0000-0002-2955-2066")), person(given = c("Anita"), family = "Williams", role = "ctb", comment = c(ORCID = "0000-0002-5295-8451")), person(given = c("Annick"), family = "Lenglet", role = "ctb", comment = c(ORCID = "0000-0003-2013-8405")), diff --git a/NEWS.md b/NEWS.md index 5382df1de..069e4e0cb 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9188 +# AMR 2.1.1.9189 *(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).)* @@ -6,8 +6,8 @@ This package now supports not only tools for AMR data analysis in clinical settings, but also for veterinary and environmental microbiology. This was made possible through a collaboration with the [University of Prince Edward Island's Atlantic Veterinary College](https://www.upei.ca/avc), Canada. To celebrate this great improvement of the package, we also updated the package logo to reflect this change. ## Breaking -* Dataset `antibiotics` has been renamed to `antimicrobials` as the data set contains more than just antibiotics. Calling `antibiotics` will still work, but now returns a warning. -* Removed all functions and references that used the deprecated `rsi` class, which were all replaced with their `sir` equivalents two years ago. +* Dataset `antibiotics` has been renamed to `antimicrobials` as the data set contains more than just antibiotics. Using `antibiotics` will still work, but now returns a warning. +* Removed all functions and references that used the deprecated `rsi` class, which were all replaced with their `sir` equivalents over two years ago. ## New * **One Health implementation** @@ -95,7 +95,7 @@ This package now supports not only tools for AMR data analysis in clinical setti * Added console colours support of `sir` class for Positron ## Other -* Added Dr. Larisse Bolton as contributor for her fantastic implementation of WISCA in a mathematically solid way +* Added Dr. Larisse Bolton and Aislinn Cook as contributors for their fantastic implementation of WISCA in a mathematically solid way * Added Matthew Saab, Dr. Jordan Stull, and Prof. Javier Sanchez as contributors for their tremendous input on veterinary breakpoints and interpretations * Greatly improved `vctrs` integration, a Tidyverse package working in the background for many Tidyverse functions. For users, this means that functions such as `dplyr`'s `bind_rows()`, `rowwise()` and `c_across()` are now supported for e.g. columns of class `mic`. Despite this, this `AMR` package is still zero-dependent on any other package, including `dplyr` and `vctrs`. * Greatly updated and expanded documentation @@ -103,7 +103,7 @@ This package now supports not only tools for AMR data analysis in clinical setti ## Older Versions -This changelog only contains changes from AMR v3.0 (February 2025) and later. +This changelog only contains changes from AMR v3.0 (March 2025) and later. * For prior v2 versions, please see [our v2 archive](https://github.com/msberends/AMR/blob/v2.1.1/NEWS.md). * For prior v1 versions, please see [our v1 archive](https://github.com/msberends/AMR/blob/v1.8.2/NEWS.md). diff --git a/PythonPackage/AMR/AMR.egg-info/PKG-INFO b/PythonPackage/AMR/AMR.egg-info/PKG-INFO index a6cae88a7..bdfd3c311 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.9188 +Version: 2.1.1.9189 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.9188.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9188.tar.gz deleted file mode 100644 index d1d6caf3d613c50fa1051a481422565bf6ce70ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10087 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 NI>Jn(;dbER{uj9&|3m-) diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9188-py3-none-any.whl b/PythonPackage/AMR/dist/amr-2.1.1.9189-py3-none-any.whl similarity index 52% rename from PythonPackage/AMR/dist/amr-2.1.1.9188-py3-none-any.whl rename to PythonPackage/AMR/dist/amr-2.1.1.9189-py3-none-any.whl index 741e00e8e6c964efd1882a48c20d499186862285..5f7c51a1c656c5dd9c034f522156b0957389f54c 100644 GIT binary patch delta 4179 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 UV*j6;{+{$9BJ$r&MErdJ0SoNG^Z)<= delta 4153 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 P2m)ebGIyj+WTgKBAUF+r literal 0 HcmV?d00001 diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index a5d7f8e4a..45c40b7be 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.9188', + version='2.1.1.9189', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/data-raw/gpt_training_text_v2.1.1.9188.txt b/data-raw/gpt_training_text_v2.1.1.9189.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9188.txt rename to data-raw/gpt_training_text_v2.1.1.9189.txt index 70300339f..dcec36b26 100644 --- a/data-raw/gpt_training_text_v2.1.1.9188.txt +++ b/data-raw/gpt_training_text_v2.1.1.9189.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.9188. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9189. 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. ---------------------------------------------------------------------------------------------------- @@ -879,6 +879,7 @@ Authors: Other contributors: \itemize{ + \item Aislinn Cook (\href{https://orcid.org/0000-0002-9189-7815}{ORCID}) [contributor] \item Andrew P. Norgan (\href{https://orcid.org/0000-0002-2955-2066}{ORCID}) [contributor] \item Anita Williams (\href{https://orcid.org/0000-0002-5295-8451}{ORCID}) [contributor] \item Annick Lenglet (\href{https://orcid.org/0000-0003-2013-8405}{ORCID}) [contributor] diff --git a/man/AMR.Rd b/man/AMR.Rd index 50cab1dee..7157defa5 100644 --- a/man/AMR.Rd +++ b/man/AMR.Rd @@ -61,6 +61,7 @@ Authors: Other contributors: \itemize{ + \item Aislinn Cook (\href{https://orcid.org/0000-0002-9189-7815}{ORCID}) [contributor] \item Andrew P. Norgan (\href{https://orcid.org/0000-0002-2955-2066}{ORCID}) [contributor] \item Anita Williams (\href{https://orcid.org/0000-0002-5295-8451}{ORCID}) [contributor] \item Annick Lenglet (\href{https://orcid.org/0000-0003-2013-8405}{ORCID}) [contributor] diff --git a/pkgdown/extra.js b/pkgdown/extra.js index f36e2e153..2f3e14e61 100644 --- a/pkgdown/extra.js +++ b/pkgdown/extra.js @@ -35,8 +35,9 @@ $(document).ready(function() { // replace 'Developers' with 'Maintainers' on the main page, and "Contributors" on the Authors page $(".developers h2").text("Maintainers"); - $(".citation h2:nth(0)").text("All contributors"); - $(".citation h2:nth(1)").text("How to Cite"); + $(".template-citation-authors h1:nth(0)").text("Contributors and Citation"); + $(".template-citation-authors h2:nth(0)").text("All contributors"); + $(".template-citation-authors h2:nth(1)").text("How to Cite"); // remove \donttest and \dontrun texts in Examples if ($("#ref-examples ~ div pre").length > 0) { @@ -69,6 +70,8 @@ $(document).ready(function() { if (typeof(x) != "undefined") { const prefix = ' '; + // bit weird, but we refer to languages here! So "uk" is Ukrain, not UK - take "en" for that. + x = x.replace("Aislinn", prefix + "en" + suffix + "Aislinn"); x = x.replace("Alex", prefix + "de" + suffix + "Alex"); x = x.replace("Andrew", prefix + "us" + suffix + "Andrew"); x = x.replace("Anita", prefix + "au" + suffix + "Anita");