Changeset 985ad94 in sasview

Timestamp:

Aug 4, 2017 7:17:06 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:

ee18d33

Parents:

7adc2a8

Message:

Fixed pyinstaller build

Files:

• sasview/sasview.py (modified) (3 diffs)
• sasview/sasview.spec (modified) (1 diff)
• setup.py (modified) (4 diffs, 1 prop)
• src/sas/qtgui/Utilities/GuiUtils.py (modified) (1 diff)
• src/sas/qtgui/Utilities/IPythonWidget.py (modified) (1 diff, 1 prop)

sasview/sasview.py

@@ -13 +13 @@
 ################################################################################
 import sys
+import os
 
 from sas.sasview.logger_config import SetupLogger
@@ -18 +19 @@
 logger = SetupLogger(__name__).config_production()
 
-
 # Log the start of the session
 logger.info(" --- SasView session started ---")
 # Log the python version
 logger.info("Python: %s" % sys.version)
-
 
 reload(sys)
@@ -37 +36 @@
     from multiprocessing import freeze_support
     freeze_support()
+    os.environ['QT_API'] = "pyqt"
     from sas.qtgui.MainWindow.MainWindow import run
     run()

sasview/sasview.spec

@@ -51 +51 @@
 datas.append(('welcome_panel.py','.'))
 
+# pyinstaller gets mightily confused by upper/lower case,
+# so some modules need to be copied explicitly to avoid
+# messages like
+# WARNING: Attempted to add Python module twice with different upper/lowercases
 datas.append((os.path.join(PYTHON_LOC,'Lib','SocketServer.py'),'.'))
+datas.append((os.path.join(PYTHON_LOC,'Lib','Queue.py'),'.'))
 
 # TODO

setup.py

@@ -193 +193 @@
 packages.append("sas.sasgui")
 
+# qt module
+package_dir["sas.qtgui"] = os.path.join("src", "sas", "qtgui")
+packages.append("sas.qtgui")
+
 # sas module
 package_dir["sas.sascalc"] = os.path.join("src", "sas", "sascalc")
@@ -264 +268 @@
 packages.extend(["sas.sascalc.file_converter",
                  "sas.sascalc.file_converter.core"])
+
 ext_modules.append(Extension("sas.sascalc.file_converter.core.bsl_loader",
                              sources=[os.path.join(mydir, "bsl_loader.c")],
                              include_dirs=[np.get_include()],
                              ))
-
 # sas.sascalc.corfunc
 package_dir["sas.sascalc.corfunc"] = os.path.join(
     "src", "sas", "sascalc", "corfunc")
-
 packages.extend(["sas.sascalc.corfunc"])
 
@@ -325 +328 @@
     "src", "sas", "sasgui", "plottools")
 packages.append("sas.sasgui.plottools")
+
+# QTGUI
+## UI
+package_dir["sas.qtgui.UI"] = os.path.join(
+    "src", "sas", "qtgui", "UI")
+packages.append("sas.qtgui.UI")
+
+## Utilities
+package_dir["sas.qtgui.Utilities"] = os.path.join(
+    "src", "sas", "qtgui", "Utilities")
+packages.append("sas.qtgui.Utilities")
+
+package_dir["sas.qtgui.Calculators"] = os.path.join(
+    "src", "sas", "qtgui", "Calculators")
+package_dir["sas.qtgui.Calculators.UI"] = os.path.join(
+    "src", "sas", "qtgui", "Calculators", "UI")
+packages.extend(["sas.qtgui.Calculators", "sas.qtgui.Calculators.UI"])
+
+package_dir["sas.qtgui.MainWindow"] = os.path.join(
+    "src", "sas", "qtgui", "MainWindow")
+package_dir["sas.qtgui.MainWindow.UI"] = os.path.join(
+    "src", "sas", "qtgui", "MainWindow", "UI")
+packages.extend(["sas.qtgui.MainWindow", "sas.qtgui.MainWindow.UI"])
+
+## Perspectives
+package_dir["sas.qtgui.Perspectives"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives")
+packages.append("sas.qtgui.Perspectives")
+
+package_dir["sas.qtgui.Perspectives.Invariant"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives", "Invariant")
+package_dir["sas.qtgui.Perspectives.Invariant.UI"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives", "Invariant", "UI")
+packages.extend(["sas.qtgui.Perspectives.Invariant", "sas.qtgui.Perspectives.Invariant.UI"])
+
+package_dir["sas.qtgui.Perspectives.Fitting"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives", "Fitting")
+package_dir["sas.qtgui.Perspectives.Fitting.UI"] = os.path.join(
+    "src", "sas", "qtgui", "Perspectives", "Fitting", "UI")
+packages.extend(["sas.qtgui.Perspectives.Fitting", "sas.qtgui.Perspectives.Fitting.UI"])
+
+## Plotting
+package_dir["sas.qtgui.Plotting"] = os.path.join(
+    "src", "sas", "qtgui", "Plotting")
+package_dir["sas.qtgui.Plotting.UI"] = os.path.join(
+    "src", "sas", "qtgui", "Plotting", "UI")
+package_dir["sas.qtgui.Plotting.Slicers"] = os.path.join(
+    "src", "sas", "qtgui", "Plotting", "Slicers")
+packages.extend(["sas.qtgui.Plotting", "sas.qtgui.Plotting.UI", "sas.qtgui.Plotting.Slicers"])
+
+
 
 # # Last of the sas.models
@@ -421 +475 @@
     entry_points={
         'console_scripts': [
-            "sasview = sas.sasview.sasview:run",
+            "sasview = sas.run",
         ]
     },

src/sas/qtgui/Utilities/GuiUtils.py

@@ -96 +96 @@
 
 ## TODO: CHANGE FOR SHIPPED PATH IN RELEASE
-HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
+if os.path.splitext(sys.argv[0])[1].lower() != ".py":
+     HELP_DIRECTORY_LOCATION = "doc"
+else:
+     HELP_DIRECTORY_LOCATION = "docs/sphinx-docs/build/html"
 IMAGES_DIRECTORY_LOCATION = HELP_DIRECTORY_LOCATION + "/_images"
 

src/sas/qtgui/Utilities/IPythonWidget.py

@@ +1 @@
+def new_load_qt(api_options):
+    from PyQt4 import QtCore, QtGui, QtSvg
+    return QtCore, QtGui, QtSvg, 'pyqt'
+
+def qtconsole_new_load_qt(api_options):
+    from PyQt4 import QtCore, QtGui, QtSvg
+
+    # Alias PyQt-specific functions for PySide compatibility.
+    QtCore.Signal = QtCore.pyqtSignal
+    QtCore.Slot = QtCore.pyqtSlot
+    return QtCore, QtGui, QtSvg, 'pyqt'
+
+# Do some monkey patching to satisfy pyinstaller complaining
+# about pyside/pyqt confusion
+from IPython.external import  qt_loaders
+qt_loaders.load_qt = new_load_qt
+
+from qtconsole import qt_loaders as qtconsole_qt_loaders
+qtconsole_qt_loaders.load_qt = qtconsole_new_load_qt
+
+
 from qtconsole.rich_jupyter_widget import RichJupyterWidget
 from qtconsole.inprocess import QtInProcessKernelManager