some general code care

kivy_garden/matplotlib/__init__.py

@@ -7,15 +7,15 @@
 
 from ._version import __version__
 
-from kivy_garden.matplotlib.backend_kivy import (
+from .backend_kivy import (
     FigureCanvasKivy,
     FigureManagerKivy,
     RendererKivy,
     GraphicsContextKivy,
     NavigationToolbar2Kivy,
     MPLKivyApp,
 )
-from kivy_garden.matplotlib.backend_kivyagg import FigureCanvasKivyAgg
+from .backend_kivyagg import FigureCanvasKivyAgg
 
 __all__ = (
     FigureCanvasKivy.__name__,

kivy_garden/matplotlib/backend_kivy.py

@@ -61,7 +61,7 @@
         my_mpl_kivy_widget = FigureCanvas(fig)
         fig.canvas.mpl_connect('button_press_event', callback_handler)
 
-2. Use pyplot to write the application following matplotlib sintax as can be
+2. Use pyplot to write the application following matplotlib syntax as can be
 seen in the second example below. In this case a Kivy application will be
 created automatically from the matplotlib instructions and a NavigationToolbar
 will be added to the main canvas.
@@ -228,9 +228,13 @@ def close(event):
     print_function,
     unicode_literals,
 )
-
-import six
+from packaging.version import Version
 import os
+import textwrap
+import uuid
+import six
+import numbers
+import numpy as np
 import matplotlib
 from matplotlib._pylab_helpers import Gcf
 from matplotlib.backend_bases import (
@@ -243,11 +247,13 @@ def close(event):
 )
 from matplotlib.figure import Figure
 from matplotlib.transforms import Affine2D
-from matplotlib.backend_bases import (ShowBase,
-                                      Event,
-                                      ResizeEvent,
-                                      MouseEvent,
-                                      KeyEvent)
+from matplotlib.backend_bases import (
+    ShowBase,
+    Event,
+    ResizeEvent,
+    MouseEvent,
+    KeyEvent,
+)
 from matplotlib.backends.backend_agg import FigureCanvasAgg
 from matplotlib.mathtext import MathTextParser
 from matplotlib import rcParams
@@ -258,9 +264,27 @@ def close(event):
 except ImportError:
     raise ImportError("this backend requires Kivy to be installed.")
 
+from kivy.logger import Logger
+
+from kivy.base import EventLoop
+from kivy.properties import ObjectProperty
 from kivy.app import App
+from kivy.graphics import (
+    Line,
+    Rectangle,
+    Color,
+    Rotate,
+    Translate,
+    Mesh,
+    StencilPush,
+    StencilPop,
+    StencilUse,
+    StencilUnUse,
+)
 from kivy.graphics.texture import Texture
-from kivy.graphics import Rectangle
+from kivy.graphics.tesselator import Tesselator
+from kivy.graphics.context_instructions import PopMatrix, PushMatrix
+
 from kivy.uix.widget import Widget
 from kivy.uix.floatlayout import FloatLayout
 from kivy.uix.behaviors import FocusBehavior
@@ -273,35 +297,21 @@ def close(event):
     ActionOverflow,
     ActionSeparator,
 )
-from kivy.base import EventLoop
 from kivy.core.text import Label as CoreLabel
 from kivy.core.image import Image
-from kivy.graphics import Color, Line
-from kivy.graphics import Rotate, Translate
 from kivy.graphics.instructions import InstructionGroup
-from kivy.graphics.tesselator import Tesselator
-from kivy.graphics.context_instructions import PopMatrix, PushMatrix
-from kivy.graphics import StencilPush, StencilPop, StencilUse, StencilUnUse
-from kivy.logger import Logger
-from kivy.graphics import Mesh
 from kivy.resources import resource_find
 from kivy.uix.stencilview import StencilView
 from kivy.core.window import Window
 from kivy.uix.popup import Popup
-from kivy.properties import ObjectProperty
 from kivy.lang import Builder
 from kivy.clock import Clock
-from distutils.version import LooseVersion
 
-_mpl_ge_1_5 = LooseVersion(matplotlib.__version__) >= LooseVersion("1.5.0")
-_mpl_ge_2_0 = LooseVersion(matplotlib.__version__) >= LooseVersion("2.0.0")
+kivy.require("1.9.1")
 
-import numpy as np
-import textwrap
-import uuid
-import numbers
+_mpl_ge_1_5 = Version(matplotlib.__version__) >= Version("1.5.0")
+_mpl_ge_2_0 = Version(matplotlib.__version__) >= Version("2.0.0")
 
-kivy.require("1.9.1")
 
 toolbar = None
 my_canvas = None
@@ -317,7 +327,6 @@ class MPLKivyApp(App):
     """Creates the App initializing a FloatLayout with a figure and toolbar
     widget.
     """
-
     figure = ObjectProperty(None)
     toolbar = ObjectProperty(None)
 
@@ -347,7 +356,7 @@ class Show(ShowBase):
     """
 
     @classmethod
-    def mainloop(self):
+    def mainloop(cls):
         app = App.get_running_app()
         if app is None:
             app = MPLKivyApp(figure=my_canvas, toolbar=toolbar)
@@ -989,8 +998,9 @@ def _init_toolbar(self):
         """
         basedir = os.path.join(rcParams["datapath"], "images")
         actionview = ActionView()
-        actionprevious = ActionPrevious(title="Navigation",
-                                        with_previous=False)
+        actionprevious = ActionPrevious(
+            title="Navigation", with_previous=False,
+        )
         actionoverflow = ActionOverflow()
         actionview.add_widget(actionprevious)
         actionview.add_widget(actionoverflow)
@@ -1212,13 +1222,14 @@ def on_touch_down(self, touch):
         newcoord = self.to_widget(touch.x, touch.y, relative=True)
         x = newcoord[0]
         y = newcoord[1]
+
         if super(FigureCanvasKivy, self).on_touch_down(touch):
             return True
         if self.collide_point(*touch.pos):
             self.motion_notify_event(x, y)
             touch.grab(self)
-            if 'button' in touch.profile and touch.button in ("scrollup",
-                                                              "scrolldown"):
+            if ("button" in touch.profile and touch.button in ("scrollup",
+                                                               "scrolldown")):
                 self.scroll_event(x, y, 5)
             else:
                 self.button_press_event(x, y, self.get_mouse_button(touch))
@@ -1269,8 +1280,8 @@ def on_touch_up(self, touch):
         x = newcoord[0]
         y = newcoord[1]
         if touch.grab_current is self:
-            if 'button' in touch.profile and touch.button in ("scrollup",
-                                                              "scrolldown"):
+            if ("button" in touch.profile and touch.button in ("scrollup",
+                                                               "scrolldown")):
                 self.scroll_event(x, y, 5)
             else:
                 self.button_release_event(x, y, self.get_mouse_button(touch))

kivy_garden/matplotlib/backend_kivyagg.py

@@ -71,7 +71,9 @@ def my_callback(event):
     unicode_literals,
 )
 
-__all__ = "FigureCanvasKivyAgg"
+__all__ = (
+    "FigureCanvasKivyAgg",
+)
 
 from matplotlib.figure import Figure
 from matplotlib.backends.backend_agg import FigureCanvasAgg
@@ -130,7 +132,6 @@ class MPLKivyApp(App):
     """Creates the App initializing a FloatLayout with a figure and toolbar
     widget.
     """
-
     figure = ObjectProperty(None)
     toolbar = ObjectProperty(None)
 
@@ -152,7 +153,7 @@ class Show(ShowBase):
     """
 
     @classmethod
-    def mainloop(self):
+    def mainloop(cls):
         global my_canvas
         global toolbar
         app = App.get_running_app()

pytest.ini

@@ -0,0 +1,2 @@
+[pytest]
+filterwarnings = ignore::DeprecationWarning:(?!kivy_garden.matplotlib)

setup.py

@@ -42,7 +42,10 @@
     keywords='Kivy kivy-garden',
 
     packages=find_namespace_packages(include=['kivy_garden.*']),
-    install_requires=['matplotlib>=3.7.2', 'kivy>=2.1.0'],
+    install_requires=[
+        'matplotlib>=3',
+        'kivy>=1.9.1'
+    ],
     extras_require={
         'dev': ['pytest>=3.6', 'pytest-cov', 'pytest-asyncio',
                 'sphinx_rtd_theme'],