diff --git a/gui/graphFrame.py b/gui/graphFrame.py index b0de2d293..ee4107968 100644 --- a/gui/graphFrame.py +++ b/gui/graphFrame.py @@ -36,7 +36,6 @@ from service.fit import Fit pyfalog = Logger(__name__) try: - pyfalog.warning('before mpl import') import matplotlib as mpl mpl_version = int(mpl.__version__[0]) or -1 @@ -45,14 +44,10 @@ try: mplImported = True else: mplImported = False - pyfalog.warning('before patch import') from matplotlib.patches import Patch - pyfalog.warning('before canvas import') from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas - pyfalog.warning('before figure import') from matplotlib.figure import Figure - pyfalog.warning('done') graphFrame_enabled = True mplImported = True @@ -62,7 +57,6 @@ except ImportError as e: Patch = mpl = Canvas = Figure = None graphFrame_enabled = False mplImported = False - raise except Exception: # We can get exceptions deep within matplotlib. Catch those. See GH #1046 tb = traceback.format_exc() diff --git a/requirements.txt b/requirements.txt index 8fcdcf82a..82083ff69 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ wxPython == 4.0.6 logbook >= 1.0.0 -matplotlib >= 3.0.0 +matplotlib == 3.0.3 python-dateutil requests >= 2.0.0 sqlalchemy >= 1.3.0