diff --git a/.github/prehooks/commit-msg b/.github/prehooks/commit-msg index d3d9628a..1dc04bf3 100755 --- a/.github/prehooks/commit-msg +++ b/.github/prehooks/commit-msg @@ -60,5 +60,7 @@ else fi git add data-raw/* +git add PythonPackage/* +git add -u exit 0 diff --git a/.github/prehooks/pre-commit b/.github/prehooks/pre-commit index 9b92fc38..c95c4156 100755 --- a/.github/prehooks/pre-commit +++ b/.github/prehooks/pre-commit @@ -115,6 +115,9 @@ echo "${currentversion}" > .git/commit_version.tmp bash data-raw/_generate_GPT_knowledge_input.sh "${currentversion}" cd data-raw bash _generate_python_wrapper.sh +cd .. +git add data-raw/* git add PythonPackage/* +git add -u exit 0 diff --git a/DESCRIPTION b/DESCRIPTION index 0d7bb751..89838e50 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: AMR -Version: 2.1.1.9108 +Version: 2.1.1.9109 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 4d24d1aa..472dcb62 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# AMR 2.1.1.9108 +# AMR 2.1.1.9109 *(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 43319c06..5113b60e 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.9107 +Version: 2.1.1.9109 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/dist/AMR-2.1.1.9107-py3-none-any.whl b/PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl similarity index 84% rename from PythonPackage/AMR/dist/AMR-2.1.1.9107-py3-none-any.whl rename to PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl index af61e354..8fb5c5d1 100644 Binary files a/PythonPackage/AMR/dist/AMR-2.1.1.9107-py3-none-any.whl and b/PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl differ diff --git a/PythonPackage/AMR/dist/amr-2.1.1.9107.tar.gz b/PythonPackage/AMR/dist/amr-2.1.1.9107.tar.gz deleted file mode 100644 index e882e2c7..00000000 Binary files a/PythonPackage/AMR/dist/amr-2.1.1.9107.tar.gz and /dev/null 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 new file mode 100644 index 00000000..4a516060 Binary files /dev/null and b/PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz differ diff --git a/PythonPackage/AMR/setup.py b/PythonPackage/AMR/setup.py index 42a10029..c73b7549 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.9107', + version='2.1.1.9109', packages=find_packages(), install_requires=[ 'rpy2', diff --git a/data-raw/gpt_training_text_v2.1.1.9107.txt b/data-raw/gpt_training_text_v2.1.1.9109.txt similarity index 99% rename from data-raw/gpt_training_text_v2.1.1.9107.txt rename to data-raw/gpt_training_text_v2.1.1.9109.txt index 8019823b..b463de6c 100644 --- a/data-raw/gpt_training_text_v2.1.1.9107.txt +++ b/data-raw/gpt_training_text_v2.1.1.9109.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.9107. Remember this whenever someone asks which AMR package version you’re at. +First and foremost, you are trained on version 2.1.1.9109. Remember this whenever someone asks which AMR package version you’re at. -------------------------------- THE PART HEREAFTER CONTAINS CONTENTS FROM FILE 'NAMESPACE':