From b10989f431bf7e9566005b90e4f89a8f75803104 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Sun, 23 Feb 2025 19:18:42 +0100 Subject: [PATCH] (v2.1.1.9156) fix for knitr in WISCA --- DESCRIPTION | 2 +- NEWS.md | 2 +- PythonPackage/AMR/AMR.egg-info/PKG-INFO | 2 +- ...ny.whl => AMR-2.1.1.9156-py3-none-any.whl} | Bin 10286 -> 10284 bytes PythonPackage/AMR/dist/amr-2.1.1.9155.tar.gz | Bin 10094 -> 0 bytes PythonPackage/AMR/dist/amr-2.1.1.9156.tar.gz | Bin 0 -> 10115 bytes PythonPackage/AMR/setup.py | 2 +- R/antibiogram.R | 2 +- ....txt => gpt_training_text_v2.1.1.9156.txt} | 2 +- 9 files changed, 6 insertions(+), 6 deletions(-) rename PythonPackage/AMR/dist/{AMR-2.1.1.9155-py3-none-any.whl => AMR-2.1.1.9156-py3-none-any.whl} (85%) delete mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9155.tar.gz create mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9156.tar.gz rename data-raw/{gpt_training_text_v2.1.1.9155.txt => gpt_training_text_v2.1.1.9156.txt} (99%) diff --git a/DESCRIPTION b/DESCRIPTION index 436912be3..46f0fda36 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9155 +Version: 2.1.1.9156 Date: 2025-02-23 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 434953dbb..ab955619a 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9155 +# AMR 2.1.1.9156 *(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 7e2f2d1fd..8ae386eaf 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.9155 +Version: 2.1.1.9156 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.9155-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9156-py3-none-any.whl similarity index 85% rename from PythonPackage/AMR/dist/AMR-2.1.1.9155-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9156-py3-none-any.whl index 42baddfc3d318762de83362ea6ca293a7f010f5e..b5ad7360cf2ce2628ad1c7f999c660d4b11166ff 100644 GIT binary patch delta 622 zcmZ1%uqJ>fz?+#xgn@y9gCTFyMxG{Cro2g;C$NgLfav9%@3}ehCxu7t+o%#Td7h{w zquJygqE(Ewn~lY)d71JjP2Qj^4-~tgTn6HJsDL;bDjM}5J$c95>*5)K1~V}*$OA2K z^bOKA(lZ1?OG8sLy_C%265Y(aw0!*_S7-kqm)dg&ixwF$G(4=H&zhqoFw2>LMZi>+ z#wPB)DHjr0RUQavefaXaY}wqnU7zpo|EViwXB5`qWMr1@zSKIsnA!ID^)ksL_go)q zzKz^{tv;@)SejY5-9eO{c?$O;`6`yZwaaHLW0POA`>^rM(w%SWEN%xLZdsG?cJ-8B zosF+A@m9Qjc8=xao<#?}CNI`A_bUu}#__=a`IYX)I#M5nwKhlBobAoXHr&tQ@scm! zT>skr=oQm~n;H#ys~!uoU-R$k^WptF`N~h8dxtML7{`^=2k9PJS-GSvW$l_1zn1YQ z&fYsK^s@EapSBBKE?9;1zxIAs^ho!6!;0>ZDT?~RtV{{7_Ft~Qw#|3no!$d}Pk49s zH)t<<^)&6CR!IKeDaLYprhSW^`+;@&>E2&U5`I`~&7KzfssE4Bt@ZYH=$z1!DFKk=BsQ%T`xUKD{g})jf zFE)Da*sOK;Y*|n3gIng|`F%xeo6BXUp1K>-+aob?Ys>_nFR6i{=4nV-wzMh zMH!u6w6I5zc0*jG;-{)=RVnW!$8IaOFcq7;+4`Sn`M%wrw!X7#7z4Z+nM9aj zF+SNq%^DcflXD@|Dm5EKe7{pu2S%rux;!Xu&DC|~ks~bJ!`0OX*({)%W_4X~{Ht)n W<9_lzbv2+EtA-+*iW)EhFaQ8!!T`Ad diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9155.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9155.tar.gz deleted file mode 100644 index 5655fa851525b61a10fa2c5a096bff0f7564c379..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10094 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 diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9156.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9156.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..1c47897e531dfa126dfc6d93dcb2604910c8e149 GIT binary patch literal 10115 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 literal 0 HcmV?d00001 diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index 7caaa3f0a..0e25bbdcf 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.9155', + version='2.1.1.9156', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/R/antibiogram.R b/R/antibiogram.R index b9087166c..0afd42cee 100755 --- a/R/antibiogram.R +++ b/R/antibiogram.R @@ -1245,7 +1245,7 @@ knit_print.antibiogram <- function(x, italicise = TRUE, na = getOption("knitr.ka meet_criteria(italicise, allow_class = "logical", has_length = 1) meet_criteria(na, allow_class = "character", has_length = 1, allow_NA = TRUE) - if (isTRUE(italicise) && "mo" %in% colnames(attributes(x)$long_numeric)) { + if (!isTRUE(attributes(x)$wisca) && isTRUE(italicise) && "mo" %in% colnames(attributes(x)$long_numeric)) { # make all microorganism names italic, according to nomenclature names_col <- ifelse(isTRUE(attributes(x)$has_syndromic_group), 2, 1) x[[names_col]] <- italicise_taxonomy(x[[names_col]], type = "markdown") diff --git a/data-raw/gpt_training_text_v2.1.1.9155.txt b/data-raw/gpt_training_text_v2.1.1.9156.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9155.txt rename to data-raw/gpt_training_text_v2.1.1.9156.txt index ccdfd9f03..6f42d5e7b 100644 --- a/data-raw/gpt_training_text_v2.1.1.9155.txt +++ b/data-raw/gpt_training_text_v2.1.1.9156.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.9155. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9156. 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. ----------------------------------------------------------------------------------------------------