From 9650545d6e0a7dc520645691faf396acaaecfab5 Mon Sep 17 00:00:00 2001 From: Matthijs Berends Date: Sat, 15 Feb 2025 13:40:51 +0100 Subject: [PATCH] (v2.1.1.9150) unit tests --- DESCRIPTION | 2 +- NEWS.md | 2 +- PythonPackage/AMR/AMR.egg-info/PKG-INFO | 2 +- ...ny.whl => AMR-2.1.1.9150-py3-none-any.whl} | Bin 10255 -> 10254 bytes PythonPackage/AMR/dist/amr-2.1.1.9149.tar.gz | Bin 10091 -> 0 bytes PythonPackage/AMR/dist/amr-2.1.1.9150.tar.gz | Bin 0 -> 10091 bytes PythonPackage/AMR/setup.py | 2 +- R/antibiogram.R | 2 +- ....txt => gpt_training_text_v2.1.1.9150.txt} | 4 ++-- man/antibiogram.Rd | 2 +- tests/testthat/test-antibiogram.R | 8 ++++++-- 11 files changed, 14 insertions(+), 10 deletions(-) rename PythonPackage/AMR/dist/{AMR-2.1.1.9149-py3-none-any.whl => AMR-2.1.1.9150-py3-none-any.whl} (85%) delete mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9149.tar.gz create mode 100644 PythonPackage/AMR/dist/amr-2.1.1.9150.tar.gz rename data-raw/{gpt_training_text_v2.1.1.9149.txt => gpt_training_text_v2.1.1.9150.txt} (99%) diff --git a/DESCRIPTION b/DESCRIPTION index 2fa608c8f..75f341427 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9149 +Version: 2.1.1.9150 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 8b8082b61..c959c0568 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9149 +# AMR 2.1.1.9150 *(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 eda33c69d..1711457fe 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.9149 +Version: 2.1.1.9150 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.9149-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9150-py3-none-any.whl similarity index 85% rename from PythonPackage/AMR/dist/AMR-2.1.1.9149-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9150-py3-none-any.whl index f3c5ebaaf9ff13a567ddd647447b7b7f95ea4186..c0a981fd32b181743a499948960a4ee33d3131c4 100644 GIT binary patch delta 608 zcmeAV=nLQp@MdNaVPIh3V9-z9$Wy_}q@TLEja8HdM9<~C#m!-m>K|nm>b-7qy{H6} zslnu#qLoZlzMDnFs(G0VQYTMTmIH}yR4xPYG*!SnPZf=NkiIxx%i{@*K*O0B803ML zIQjkgKzQkW1~k(?zQc7#bed&R31l6FReqTVzE{ z(1b;7W|Hj*dV)|7Y_b{g@hbugLM`8>6OwB>|;Bo?YG)Baxnc z_3P;aomuryw(gqJrhaMCib-Y7k;Nt9y?bW$9cU2PJL5i|b%%3&$G`T+y;59E-kD0A zk2_whSow!H`_G}7B1^7SBxfeg;lBRRGGO7K^P2g&dKK6IwY2@%wfJ6~=QPu0c@ACQ z-+sE>yfNmTaNp4=1uv@9tqEy*rZ zaFIk-?l;3nFRRYY4N2Qu{ABsv3mcQACVxC%x2yH0)rq17CpH=WpL=h8u64z(yzV(q z9tXMve7n7*PQGVhTd(-io=s=dQ`319z1zaqZDH{EDJy!nbzXOM;k?fFibrkyAEydQ zt&`+j&U?*W^4&Iew^du_sc>2NZ8r*-;rLLQ{l8@2+fa#UhCMZm0p5&EBFwM|pDe6q z4UFi?0T8NJ%?1(O7uD225&Kh39u%=s>N+5vhq?@imj>ZYQCH!FNAu)^>Z%|mFVq#; KSk!=#%>V$Po%a#| delta 632 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 QKZn8Ny$znj?ZU(T52#NFy8r+H diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9150.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9150.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..049e290e7ac74bd079eee57bf222bce497da2bac GIT binary patch literal 10091 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