diff --git a/DESCRIPTION b/DESCRIPTION index 89838e50..6b5bc3f9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9109 +Version: 2.1.1.9110 Date: 2024-11-21 Title: Antimicrobial Resistance Data Analysis Description: Functions to simplify and standardise antimicrobial resistance (AMR) diff --git a/NEWS.md b/NEWS.md index 472dcb62..b19d7812 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9109 +# AMR 2.1.1.9110 *(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 5113b60e..a834e1c0 100644 --- a/PythonPackage/AMR/AMR.egg-info/PKG-INFO +++ b/PythonPackage/AMR/AMR.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: AMR -Version: 2.1.1.9109 +Version: 2.1.1.9110 Summary: A Python wrapper for the AMR R package Home-page: https://github.com/msberends/AMR Author: Dr. Matthijs Berends diff --git a/PythonPackage/AMR/AMR/datasets.py b/PythonPackage/AMR/AMR/datasets.py index af5f3e88..096ed8a2 100644 --- a/PythonPackage/AMR/AMR/datasets.py +++ b/PythonPackage/AMR/AMR/datasets.py @@ -29,13 +29,13 @@ if not isinstalled('AMR'): try: python_amr_version = metadata.version('AMR') except metadata.PackageNotFoundError: - python_amr_version = None + python_amr_version = '' # R package version of AMR r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')[0] # Compare R and Python package versions -if python_amr_version and r_amr_version != python_amr_version: +if r_amr_version != python_amr_version: try: print(f"{BLUE}AMR:{RESET} Updating package version{RESET}", flush=True) utils = importr('utils') diff --git a/PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9110-py3-none-any.whl similarity index 73% rename from PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9110-py3-none-any.whl index 8fb5c5d1..5a97c131 100644 Binary files a/PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl and b/PythonPackage/AMR/dist/AMR-2.1.1.9110-py3-none-any.whl differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz deleted file mode 100644 index 4a516060..00000000 Binary files a/PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz and /dev/null differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9110.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9110.tar.gz new file mode 100644 index 00000000..30117d72 Binary files /dev/null and b/PythonPackage/AMR/dist/amr-2.1.1.9110.tar.gz differ diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index c73b7549..7346dc9c 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.9109', + version='2.1.1.9110', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/data-raw/_generate_python_wrapper.sh b/data-raw/_generate_python_wrapper.sh index 1929f0fc..5a5aa6f0 100644 --- a/data-raw/_generate_python_wrapper.sh +++ b/data-raw/_generate_python_wrapper.sh @@ -73,13 +73,13 @@ if not isinstalled('AMR'): try: python_amr_version = metadata.version('AMR') except metadata.PackageNotFoundError: - python_amr_version = None + python_amr_version = '' # R package version of AMR r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')[0] # Compare R and Python package versions -if python_amr_version and r_amr_version != python_amr_version: +if r_amr_version != python_amr_version: try: print(f"{BLUE}AMR:{RESET} Updating package version{RESET}", flush=True) utils = importr('utils') diff --git a/data-raw/gpt_training_text_v2.1.1.9109.txt b/data-raw/gpt_training_text_v2.1.1.9110.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9109.txt rename to data-raw/gpt_training_text_v2.1.1.9110.txt index b463de6c..af11f1af 100644 --- a/data-raw/gpt_training_text_v2.1.1.9109.txt +++ b/data-raw/gpt_training_text_v2.1.1.9110.txt @@ -1,5 +1,5 @@ This files contains all context you must know about the AMR package for R. -First and foremost, you are trained on version 2.1.1.9109. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9110. Remember this whenever someone asks which AMR package version you’re at. -------------------------------- THE PART HEREAFTER CONTAINS CONTENTS FROM FILE 'NAMESPACE':