Changeset 2a8bd705 in sasview

Timestamp:

Jul 25, 2017 2:36:48 AM (7 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:

b00414d

Parents:

6ff2eb3

Message:

Changes to allow pyinstaller builds

Files:

• run.py (modified) (4 diffs, 1 prop)
• sasview/local_config.py (modified) (1 diff)
• sasview/sasview.py (modified) (3 diffs)
• sasview/sasview.spec (modified) (3 diffs, 1 prop)
• src/sas/qtgui/MainWindow/MainWindow.py (modified) (1 diff)

run.py

@@ -21 +21 @@
 from contextlib import contextmanager
 from os.path import join as joinpath
-from os.path import abspath, dirname
+from os.path import abspath, dirname, realpath
 
 
@@ -64 +64 @@
     # build_path comes from context
     path = joinpath(build_path, *modname.split('.')) + ext
-    # print "importing", modname, "from", path
     return imp.load_dynamic(modname, path)
 
@@ -77 +76 @@
     # find the directories for the source and build
     from distutils.util import get_platform
-    root = abspath(dirname(__file__))
+    root = abspath(dirname(sys.argv[0]))
+
     platform = '%s-%s' % (get_platform(), sys.version[:3])
     build_path = joinpath(root, 'build', 'lib.' + platform)
@@ -144 +144 @@
     # Need to add absolute path before actual prepare call,
     # so logging can be done during initialization process too
-    root = abspath(dirname(__file__))
+    root = abspath(dirname(realpath(sys.argv[0])))
     addpath(joinpath(root, 'sasview'))
     from logger_config import SetupLogger

sasview/local_config.py

@@ -114 +114 @@
 #DEFAULT_STYLE = GUIFRAME.MULTIPLE_APPLICATIONS|GUIFRAME.MANAGER_ON\
 #                    |GUIFRAME.CALCULATOR_ON|GUIFRAME.TOOLBAR_ON
+DEFAULT_STYLE = 64
+
 SPLASH_SCREEN_WIDTH = 512
 SPLASH_SCREEN_HEIGHT = 366

sasview/sasview.py

@@ -12 +12 @@
 # copyright 2009, University of Tennessee
 ################################################################################
-import os
-import os.path
 import sys
-import traceback
 
 from sas.sasview.logger_config import SetupLogger
@@ -27 +24 @@
 logger.info("Python: %s" % sys.version)
 
-# Allow the dynamic selection of wxPython via an environment 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:
-    logger.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]):
-        logger.info("Version %s of wxPython is installed, so using that version." % os.environ[WX_ENV_VAR])
-        wxversion.select(os.environ[WX_ENV_VAR])
-    else:
-        logger.error("Version %s of wxPython is not installed, so using default version." % os.environ[WX_ENV_VAR])
-else:
-    logger.info("You have not set the %s environment variable, so using default version of wxPython." % WX_ENV_VAR)
 
-import wx
-
-try:
-    logger.info("Wx version: %s" % wx.__version__)
-except:
-    logger.error("Wx version: error reading version")
-
-import wxcruft
-wxcruft.call_later_fix()
-# wxcruft.trace_new_id()
-
-# Always use private .matplotlib setup to avoid conflicts with other
-# uses of matplotlib
-# Have to check if .sasview exists first
-sasdir = os.path.join(os.path.expanduser("~"),'.sasview')
-if not os.path.exists(sasdir):
-    os.mkdir(sasdir)
-mplconfigdir = os.path.join(os.path.expanduser("~"),'.sasview','.matplotlib')
-if not os.path.exists(mplconfigdir):
-    os.mkdir(mplconfigdir)
-os.environ['MPLCONFIGDIR'] = mplconfigdir
 reload(sys)
 sys.setdefaultencoding("iso-8859-1")
-from sas.sasgui.guiframe import gui_manager
-from sas.sasgui.guiframe.gui_style import GUIFRAME
-from welcome_panel import WelcomePanel
 
 PLUGIN_MODEL_DIR = 'plugin_models'
 APP_NAME = 'SasView'
 
-from matplotlib import backend_bases
-backend_bases.FigureCanvasBase.filetypes.pop('pgf', None)
-
-class SasView():
-    """
-    Main class for running the SasView application
-    """
-    def __init__(self):
-        """
-        """
-        # from gui_manager import ViewApp
-        self.gui = gui_manager.SasViewApp(0)
-        # Set the application manager for the GUI
-        self.gui.set_manager(self)
-        # Add perspectives to the basic application
-        # Additional perspectives can still be loaded
-        # dynamically
-        # Note: py2exe can't find dynamically loaded
-        # modules. We load the fitting module here
-        # to ensure a complete Windows executable build.
-
-        # Fitting perspective
-        try:
-            import sas.sasgui.perspectives.fitting as module
-            fitting_plug = module.Plugin()
-            self.gui.add_perspective(fitting_plug)
-        except Exception:
-            logger.error("%s: could not find Fitting plug-in module"% APP_NAME)
-            logger.error(traceback.format_exc())
-
-        # P(r) perspective
-        try:
-            import sas.sasgui.perspectives.pr as module
-            pr_plug = module.Plugin()
-            self.gui.add_perspective(pr_plug)
-        except:
-            logger.error("%s: could not find P(r) plug-in module"% APP_NAME)
-            logger.error(traceback.format_exc())
-
-        # Invariant perspective
-        try:
-            import sas.sasgui.perspectives.invariant as module
-            invariant_plug = module.Plugin()
-            self.gui.add_perspective(invariant_plug)
-        except Exception as e :
-            logger.error("%s: could not find Invariant plug-in module"% \
-                          APP_NAME)
-            logger.error(traceback.format_exc())
-
-        # Corfunc perspective
-        try:
-            import sas.sasgui.perspectives.corfunc as module
-            corfunc_plug = module.Plugin()
-            self.gui.add_perspective(corfunc_plug)
-        except:
-            logger.error("Unable to load corfunc module")
-
-        # Calculator perspective
-        try:
-            import sas.sasgui.perspectives.calculator as module
-            calculator_plug = module.Plugin()
-            self.gui.add_perspective(calculator_plug)
-        except:
-            logger.error("%s: could not find Calculator plug-in module"% \
-                                                        APP_NAME)
-            logger.error(traceback.format_exc())
-
-        # File converter tool
-        try:
-            import sas.sasgui.perspectives.file_converter as module
-            converter_plug = module.Plugin()
-            self.gui.add_perspective(converter_plug)
-        except:
-            logger.error("%s: could not find File Converter plug-in module"% \
-                                                        APP_NAME)
-            logger.error(traceback.format_exc())
-
-        # Add welcome page
-        self.gui.set_welcome_panel(WelcomePanel)
-
-        # Build the GUI
-        self.gui.build_gui()
-        # delete unused model folder
-        self.gui.clean_plugin_models(PLUGIN_MODEL_DIR)
-        # Start the main loop
-        self.gui.MainLoop()
-
-
-def run():
+def runSasView():
     """
     __main__ method for loading and running SasView
@@ -169 +37 @@
     from multiprocessing import freeze_support
     freeze_support()
-    if len(sys.argv) > 1:
-        ## Run sasview as an interactive python interpreter
-        # if sys.argv[1] == "-i":
-        #    sys.argv = ["ipython", "--pylab"]
-        #    from IPython import start_ipython
-        #    sys.exit(start_ipython())
-        thing_to_run = sys.argv[1]
-        sys.argv = sys.argv[1:]
-        import runpy
-        if os.path.exists(thing_to_run):
-            runpy.run_path(thing_to_run, run_name="__main__")
-        else:
-            runpy.run_module(thing_to_run, run_name="__main__")
-    else:
-        SasView()
+    from sas.qtgui.MainWindow.MainWindow import run
+    run()
 
 
 if __name__ == "__main__":
-    run()
+    runSasView()

sasview/sasview.spec

@@ -51 +51 @@
 datas.append(('welcome_panel.py','.'))
 
+datas.append((os.path.join(PYTHON_LOC,'Lib','SocketServer.py'),'.'))
+
 # TODO
 # NEED BETTER WAY TO DEAL WITH THESE RELATIVE PATHS
 datas.append((os.path.join('..','..','sasmodels','sasmodels'),'sasmodels'))
 datas.append((os.path.join('..','src','sas','sasgui','perspectives','fitting','plugin_models'),'plugin_models'))
-
-# precompile sas models into the sasview build path; doesn't matter too much
-# where it is so long as it is a place that will get cleaned up afterwards.
-import sasmodels.core
-dll_path = 'compiled_models'
-if not (os.path.exists(dll_path)):
-    os.mkdir(dll_path)
-dll_path2 = os.path.join(dll_path, dll_path)
-if not (os.path.exists(dll_path2)):
-    os.mkdir(dll_path2)
-
-compiled_dlls = sasmodels.core.precompile_dlls(dll_path, dtype='double')
-
-# include the compiled models as data; coordinate the target path for the
-# data with installer_generator.py
-datas.append((os.path.join('compiled_models','compiled_models'),'compiled_models'))
 
 # These depend on whether we have MKL or Atlas numpy
@@ -114 +100 @@
 # Spelled out to enable easier editing
 excludes = []
-excludes.append('libzmq')
-excludes.append('IPython')
-excludes.append('PyQt4')
-excludes.append('PySide')
-excludes.append('Qt4')
-excludes.append('Tkinter')
-excludes.append('tk')
-excludes.append('tcl')
-# Seems we cannot build on Linux without bundling sip
-if not platform.system() == 'Linux':
-    excludes.append('sip')
-excludes.append('sympy')
-excludes.append('pytz')
-excludes.append('sklearn')
-excludes.append('zmq')
 
 # Need to explicitly exclude sasmodels here!!
@@ -138 +109 @@
  'sasmodels.core',
  'pyopencl',
- 'tinycc'
+ 'tinycc',
+ 'SocketServer'
 ]
 

src/sas/qtgui/MainWindow/MainWindow.py

@@ -48 +48 @@
     splash.show()
 
+    # fix for pyinstaller packages app to avoid ReactorAlreadyInstalledError
+    import sys
+    if 'twisted.internet.reactor' in sys.modules:
+        del sys.modules['twisted.internet.reactor']
+
     # DO NOT move the following import to the top!
     # (unless you know what you're doing)