Changeset 6d05e1d in sasview for src/sas/sasgui

Timestamp:

Dec 6, 2016 5:39:24 AM (8 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

55d89f8

Parents:

b94889a

git-author:

Piotr Rozyczko <rozyczko@…> (12/06/16 05:38:55)

git-committer:

Piotr Rozyczko <rozyczko@…> (12/06/16 05:39:24)

Message:

More functionality for quick plots + unit tests

File:

• src/sas/sasgui/plottools/config.py (modified) (2 diffs)

src/sas/sasgui/plottools/config.py

@@ -35 +35 @@
 # Sort out matplotlib version
 import matplotlib
-try:
-    import pkg_resources
-    pkg_resources.require("matplotlib>=" + plot_version)
-except:
-    from distutils.version import LooseVersion as Version
-    if Version(matplotlib.__version__) < Version(plot_version):
-        msg = "Matplotlib version must be %s or newer" % (plot_version, )
-        raise ImportError(msg)
+#try:
+#    import pkg_resources
+#    pkg_resources.require("matplotlib>=" + plot_version)
+#except:
+#    from distutils.version import LooseVersion as Version
+#    if Version(matplotlib.__version__) < Version(plot_version):
+#        msg = "Matplotlib version must be %s or newer" % (plot_version, )
+#        raise ImportError(msg)
 
 # Sort out matplotlib backend
@@ -51 +51 @@
 elif matplotlib.get_backend() != plot_backend:
     # if a backend has already been selected, make sure it is the correct one.
-    raise ImportError("Matplotlib not using backend " + plot_backend)
+    #raise ImportError("Matplotlib not using backend " + plot_backend)
+    pass
 
 # set global plot style