mirror of
https://github.com/msberends/AMR.git
synced 2024-12-25 06:46:11 +01:00
(v2.1.1.9110) update Py pkg
This commit is contained in:
parent
7f4ea96c09
commit
059618e710
@ -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)
|
||||
|
2
NEWS.md
2
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).)*
|
||||
|
||||
|
@ -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
|
||||
|
@ -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.
BIN
PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz
vendored
BIN
PythonPackage/AMR/dist/amr-2.1.1.9109.tar.gz
vendored
Binary file not shown.
BIN
PythonPackage/AMR/dist/amr-2.1.1.9110.tar.gz
vendored
Normal file
BIN
PythonPackage/AMR/dist/amr-2.1.1.9110.tar.gz
vendored
Normal file
Binary file not shown.
@ -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',
|
||||
|
@ -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')
|
||||
|
@ -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':
|
Loading…
Reference in New Issue
Block a user