(v2.1.1.9118) move ggplot2 plotting functions to general 'plotting' man page

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

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: AMR
-Version: 2.1.1.9117
+Version: 2.1.1.9118
 Summary: A Python wrapper for the AMR R package
 Home-page: https://github.com/msberends/AMR
-Author: Dr. Matthijs Berends
+Author: Matthijs Berends
 Author-email: m.s.berends@umcg.nl
 License: GPL 2
 Project-URL: Bug Tracker, https://github.com/msberends/AMR/issues

PythonPackage/AMR/AMR/__init__.py

@@ -117,8 +117,6 @@ from .functions import is_new_episode
 from .functions import ggplot_pca
 from .functions import ggplot_sir
 from .functions import geom_sir
-from .functions import theme_sir
-from .functions import labels_sir_count
 from .functions import guess_ab_col
 from .functions import italicise_taxonomy
 from .functions import italicize_taxonomy
@@ -181,6 +179,8 @@ from .functions import mo_info
 from .functions import mo_url
 from .functions import mo_property
 from .functions import pca
+from .functions import theme_sir
+from .functions import labels_sir_count
 from .functions import resistance
 from .functions import susceptibility
 from .functions import sir_confidence_interval

PythonPackage/AMR/AMR/functions.py

@@ -381,12 +381,6 @@ def ggplot_sir(*args, **kwargs):
 def geom_sir(*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.geom_sir(*args, **kwargs))
-def theme_sir(*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.theme_sir(*args, **kwargs))
-def labels_sir_count(*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.labels_sir_count(*args, **kwargs))
 def guess_ab_col(*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.guess_ab_col(*args, **kwargs))
@@ -573,6 +567,12 @@ def mo_property(*args, **kwargs):
 def pca(*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.pca(*args, **kwargs))
+def theme_sir(*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.theme_sir(*args, **kwargs))
+def labels_sir_count(*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.labels_sir_count(*args, **kwargs))
 def resistance(*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.resistance(*args, **kwargs))

PythonPackage/AMR/setup.py

@@ -2,14 +2,14 @@ from setuptools import setup, find_packages
 
 setup(
     name='AMR',
-    version='2.1.1.9117',
+    version='2.1.1.9118',
     packages=find_packages(),
     install_requires=[
         'rpy2',
         'numpy',
         'pandas',
     ],
-    author='Dr. Matthijs Berends',
+    author='Matthijs Berends',
     author_email='m.s.berends@umcg.nl',
     description='A Python wrapper for the AMR R package',
     long_description=open('README.md').read(),