(v2.1.1.9163) cleanup

PythonPackage/AMR/AMR.egg-info/PKG-INFO

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

PythonPackage/AMR/AMR/__init__.py

@@ -28,8 +28,6 @@ from .functions import age_groups
 from .functions import antibiogram
 from .functions import wisca
 from .functions import retrieve_wisca_parameters
-from .functions import amr_class
-from .functions import amr_selector
 from .functions import aminoglycosides
 from .functions import aminopenicillins
 from .functions import antifungals
@@ -61,6 +59,8 @@ from .functions import streptogramins
 from .functions import tetracyclines
 from .functions import trimethoprims
 from .functions import ureidopenicillins
+from .functions import amr_class
+from .functions import amr_selector
 from .functions import administrable_per_os
 from .functions import administrable_iv
 from .functions import not_intrinsic_resistant

PythonPackage/AMR/AMR/functions.py

@@ -114,12 +114,6 @@ def wisca(x, *args, **kwargs):
 def retrieve_wisca_parameters(wisca_model, *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.retrieve_wisca_parameters(wisca_model, *args, **kwargs))
-def amr_class(amr_class, *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.amr_class(amr_class, *args, **kwargs))
-def amr_selector(filter, *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.amr_selector(filter, *args, **kwargs))
 def aminoglycosides(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.aminoglycosides(only_sir_columns = False, *args, **kwargs))
@@ -213,6 +207,12 @@ def trimethoprims(only_sir_columns = False, *args, **kwargs):
 def ureidopenicillins(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.ureidopenicillins(only_sir_columns = False, *args, **kwargs))
+def amr_class(amr_class, *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.amr_class(amr_class, *args, **kwargs))
+def amr_selector(filter, *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.amr_selector(filter, *args, **kwargs))
 def administrable_per_os(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.administrable_per_os(only_sir_columns = False, *args, **kwargs))

PythonPackage/AMR/setup.py

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