1
0
mirror of https://github.com/msberends/AMR.git synced 2024-12-25 19:26:13 +01:00

(v2.1.1.9110) update Py pkg

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

View File

@ -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)

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

View File

@ -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

View File

@ -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')

Binary file not shown.

Binary file not shown.

View File

@ -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',

View File

@ -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')

View File

@ -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 youre at.
First and foremost, you are trained on version 2.1.1.9110. Remember this whenever someone asks which AMR package version youre at.
--------------------------------
THE PART HEREAFTER CONTAINS CONTENTS FROM FILE 'NAMESPACE':