Changeset ec3bd65 in sasview

Timestamp:

Nov 30, 2014 7:14:29 AM (9 years ago)

Author:

Peter Parker

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:

9729a6d

Parents:

1447af3

Message:

Refs #202 - Allow for dynamic selection of wxPython version via an environment variable.

File:

• sansview/sansview.py (modified) (1 diff)

sansview/sansview.py

@@ -16 +16 @@
                     filename=os.path.join(os.path.expanduser("~"),
                                           'sasview.log'))
+
+# Allow the dynamic selection of wxPython via an evironment variable, when devs
+# who have multiple versions of the module installed want to pick between them.
+# This variable does not have to be set of course, and through normal usage will
+# probably not be, but this can make things a little easier when upgrading to a
+# new version of wx.
+WX_ENV_VAR = "SASVIEW_WX_VERSION"
+if WX_ENV_VAR in os.environ:
+    logging.info("You have set the %s environment variable to %s." % (WX_ENV_VAR, os.environ[WX_ENV_VAR]))
+    import wxversion
+    if wxversion.checkInstalled(os.environ[WX_ENV_VAR]):
+        logging.info("Version %s of wxPython is installed, so using that version." % os.environ[WX_ENV_VAR])
+        wxversion.select(os.environ[WX_ENV_VAR])
+    else:
+        logging.error("Version %s of wxPython is not installed, so using default version." % os.environ[WX_ENV_VAR])
+else:
+    logging.info("You have not set the %s environment variable, so using default version of wxPython." % os.environ[WX_ENV_VAR])
 
 import wx