Changeset 001b930 in sasview

Timestamp:

Dec 6, 2011 10:58:42 AM (12 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

cb8a972

Parents:

b7cfa8d

Message:

Fix plotpanel matplotlib requirement

File:

• plottools/src/danse/common/plottools/PlotPanel.py (modified) (1 diff)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -6 +6 @@
 # Try a normal import first
 # If it fails, try specifying a version
-try:
-    import matplotlib
-    # Check version
-    toks = matplotlib.__version__.split('.')
-    if len(toks) < 3 or int(toks[1]) < 98:
-        raise RuntimeError, "PlotPanel depends on matplotlib > 0.98"
-except:
-    logging.warning("Could not load matplotlib: trying setuptools")
-    import pkg_resources
-    pkg_resources.require("matplotlib>=0.98.1")
-    import matplotlib
-
+import matplotlib
 matplotlib.interactive(False)
 #Use the WxAgg back end. The Wx one takes too long to render