P281424/AMR
1
0
Fork 0
mirror of https://github.com/msberends/AMR.git synced 2024-12-26 07:26:13 +01:00
Code Releases Activity

(v2.1.1.9110) update Py pkg

Browse Source
This commit is contained in:
dr. M.S. (Matthijs) Berends 2024-11-21 22:23:40 +01:00
parent 7f4ea96c09
commit 059618e710
10 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DESCRIPTION
View File

@ -1,5 +1,5 @@
Package: AMR Package: AMR
Version: 2.1.1.9109 Version: 2.1.1.9110
Date: 2024-11-21 Date: 2024-11-21
Title: Antimicrobial Resistance Data Analysis Title: Antimicrobial Resistance Data Analysis
Description: Functions to simplify and standardise antimicrobial resistance (AMR) Description: Functions to simplify and standardise antimicrobial resistance (AMR)

2
NEWS.md
View File

@ -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).)* *(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).)*

2
PythonPackage/AMR/AMR.egg-info/PKG-INFO
View File

@ -1,6 +1,6 @@
Metadata-Version: 2.1 Metadata-Version: 2.1
Name: AMR Name: AMR
Version: 2.1.1.9109 Version: 2.1.1.9110
Summary: A Python wrapper for the AMR R package Summary: A Python wrapper for the AMR R package
Home-page: https://github.com/msberends/AMR Home-page: https://github.com/msberends/AMR
Author: Dr. Matthijs Berends Author: Dr. Matthijs Berends

4
PythonPackage/AMR/AMR/datasets.py
View File

@ -29,13 +29,13 @@ if not isinstalled('AMR'):
try: try:
python_amr_version = metadata.version('AMR') python_amr_version = metadata.version('AMR')
except metadata.PackageNotFoundError: except metadata.PackageNotFoundError:
python_amr_version = None python_amr_version = ''
# R package version of AMR # R package version of AMR
r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')[0] r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')[0]
# Compare R and Python package versions # 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: try:
print(f"{BLUE}AMR:{RESET} Updating package version{RESET}", flush=True) print(f"{BLUE}AMR:{RESET} Updating package version{RESET}", flush=True)
utils = importr('utils') utils = importr('utils')

BIN
PythonPackage/AMR/dist/AMR-2.1.1.9109-py3-none-any.whl → PythonPackage/AMR/dist/AMR-2.1.1.9110-py3-none-any.whl vendored
View File

Binary file not shown.

BIN
PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz vendored
View File

Binary file not shown.

BIN
PythonPackage/AMR/dist/amr-2.1.1.9110.tar.gz vendored Normal file
View File

Binary file not shown.

2
PythonPackage/AMR/setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name='AMR', name='AMR',
version='2.1.1.9109', version='2.1.1.9110',
packages=find_packages(), packages=find_packages(),
install_requires=[ install_requires=[
'rpy2', 'rpy2',

4
data-raw/_generate_python_wrapper.sh
View File

@ -73,13 +73,13 @@ if not isinstalled('AMR'):
try: try:
python_amr_version = metadata.version('AMR') python_amr_version = metadata.version('AMR')
except metadata.PackageNotFoundError: except metadata.PackageNotFoundError:
python_amr_version = None python_amr_version = ''
# R package version of AMR # R package version of AMR
r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')[0] r_amr_version = robjects.r(f'as.character(packageVersion("AMR", lib.loc = "{r_lib_path}"))')[0]
# Compare R and Python package versions # 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: try:
print(f"{BLUE}AMR:{RESET} Updating package version{RESET}", flush=True) print(f"{BLUE}AMR:{RESET} Updating package version{RESET}", flush=True)
utils = importr('utils') utils = importr('utils')

2
data-raw/gpt_training_text_v2.1.1.9109.txt → data-raw/gpt_training_text_v2.1.1.9110.txt
View File

@ -1,5 +1,5 @@
This files contains all context you must know about the AMR package for R. 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': THE PART HEREAFTER CONTAINS CONTENTS FROM FILE 'NAMESPACE':