AMR 2.1.1.9109__py3-none-any.whl → 2.1.1.9111__py3-none-any.whl

AMR/__init__.py

@@ -31,6 +31,7 @@ from .functions import aminopenicillins
 from .functions import antifungals
 from .functions import antimycobacterials
 from .functions import betalactams
+from .functions import betalactams_with_inhibitor
 from .functions import carbapenems
 from .functions import cephalosporins
 from .functions import cephalosporins_1st

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

AMR/functions.py

@@ -123,6 +123,9 @@ def antimycobacterials(only_sir_columns = False, *args, **kwargs):
 def betalactams(only_sir_columns = False, *args, **kwargs):
     """See our website of the R package for the manual: https://msberends.github.io/AMR/index.html"""
     return convert_to_python(amr_r.betalactams(only_sir_columns = False, *args, **kwargs))
+def betalactams_with_inhibitor(only_sir_columns = False, *args, **kwargs):
+    """See our website of the R package for the manual: https://msberends.github.io/AMR/index.html"""
+    return convert_to_python(amr_r.betalactams_with_inhibitor(only_sir_columns = False, *args, **kwargs))
 def carbapenems(only_sir_columns = False, *args, **kwargs):
     """See our website of the R package for the manual: https://msberends.github.io/AMR/index.html"""
     return convert_to_python(amr_r.carbapenems(only_sir_columns = False, *args, **kwargs))

{AMR-2.1.1.9109.dist-info → AMR-2.1.1.9111.dist-info}/METADATA

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

AMR-2.1.1.9111.dist-info/RECORD

@@ -0,0 +1,7 @@
+AMR/__init__.py,sha256=BIRuOFootq2w62-qt1O1RxoOknTe9RoL8dR5XfOu3cI,7365
+AMR/datasets.py,sha256=IDeqfVGjzvhMhKZRlS6Pc3xIO4HBlRDvPdQjDQ8qVTc,2426
+AMR/functions.py,sha256=ioPBIGGsSO6K1RP9nDbCXHJLeY6KjZoP16HzysASKns,43898
+AMR-2.1.1.9111.dist-info/METADATA,sha256=k8JlLi5t9iupZYRcra8lb6yrho6tkaM9__S3wsH0qQI,9394
+AMR-2.1.1.9111.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+AMR-2.1.1.9111.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
+AMR-2.1.1.9111.dist-info/RECORD,,

AMR-2.1.1.9109.dist-info/RECORD

@@ -1,7 +0,0 @@
-AMR/__init__.py,sha256=Jzrh0SVD8tXP1_sJAnElOPAJcvMgtleTzdSnY3RI3HY,7315
-AMR/datasets.py,sha256=QbYkTe8Rl96tgADIZJfSwa9Y-eEFfb4faI6qw7y0szs,2451
-AMR/functions.py,sha256=XDN7fo0N3gGnZHYL0pdkG_9jwlsrvj0fo5IqLS7gWBM,43615
-AMR-2.1.1.9109.dist-info/METADATA,sha256=V-rxOr1ZpV19QgdvxFWatZPZ8CxytABo5akm2JhqqWs,9394
-AMR-2.1.1.9109.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-AMR-2.1.1.9109.dist-info/top_level.txt,sha256=7K6Mq_X_OHdXOzQM5y06VUadXjYkze6yzufL1d7_6xc,4
-AMR-2.1.1.9109.dist-info/RECORD,,