syncmoss 0.2.0__tar.gz → 0.2.1__tar.gz

{syncmoss-0.2.0 → syncmoss-0.2.1}/.gitignore

@@ -139,3 +139,13 @@ bundle/Windows/
 syncmoss/*.mdl
 syncmoss/*.png
 syncmoss/*.svg
+
+# Deprecated original minimiser, kept locally for reference / equivalence checks
+# (the active implementation is now the optimized minimi_lib.py).
+syncmoss/minimi_lib_old.py
+
+# minimi_lib optimization: local-only test tooling and notes (depend on the
+# git-ignored minimi_lib_old.py; kept out of the tracked repo).
+verify_minimi.py
+bench_coldstart.py
+minimi_optimization_notes.txt

{syncmoss-0.2.0/syncmoss.egg-info → syncmoss-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncmoss
-Version: 0.2.0
+Version: 0.2.1
 Summary: SYNCmoss — Mössbauer spectroscopy analysis application
 Author: Sergey Yaroslavtsev
 License: MIT

{syncmoss-0.2.0 → syncmoss-0.2.1}/bundle/MacOS.spec

@@ -2,30 +2,49 @@
 from PyInstaller.utils.hooks import collect_data_files, collect_submodules
 import os
 
-# Hidden imports
-hiddenimports = collect_submodules('scipy')
-hiddenimports += collect_submodules('PySide6')
-hiddenimports += collect_submodules('numba')
+# ── Hidden imports ──────────────────────────────────────────────
+# numba/llvmlite/scipy do a lot of dynamic importing, so collect their submodules
+# (this keeps core modules like scipy._cyutility that the hooks miss). The big
+# unused scipy subpackages are pruned again via scipy_excludes below; numba's own
+# test-suite is filtered out (not needed at runtime, and it emits a wall of
+# "hidden import not found" warnings for its CUDA tests).
+hiddenimports = collect_submodules('numba', filter=lambda name: 'tests' not in name)
 hiddenimports += collect_submodules('llvmlite')
+hiddenimports += collect_submodules('scipy')
+# Only the Qt modules SYNCmoss actually uses. We deliberately do NOT
+# collect_submodules('PySide6'): that drags in the QtQuick / QtQml / Qt3D /
+# WebEngine frameworks (100+ MB) the app never uses. The PySide6 PyInstaller
+# hook bundles the Qt frameworks/plugins matching just these imports. This
+# matters most on macOS, where the build is universal2 (two architectures) and
+# UPX is not applied.
+hiddenimports += ['PySide6.QtCore', 'PySide6.QtGui', 'PySide6.QtWidgets']
 # GUI smoke driver lives in tests/syncmoss_test.py; bundling it lets the frozen
 # binary self-test via `SYNCmoss --test` (see syncmoss/main.py).
 hiddenimports += ['syncmoss_test']
 
-scipy_data = collect_data_files('scipy')
+# llvmlite carries native data/bitcode that must be collected.
 llvmlite_data = collect_data_files('llvmlite')
+# On macOS, missing platform input context plugins can lead to non-editable
+# QLineEdit/QTable widgets in frozen apps. Bundle these explicitly.
+qt_plugin_data = collect_data_files(
+    'PySide6',
+    includes=[
+        'Qt/plugins/platforms/*',
+        'Qt/plugins/platforminputcontexts/*',
+        'Qt/plugins/styles/*',
+    ],
+)
 
 syncmoss_dir = os.path.abspath(os.path.join(SPECPATH, '..', 'syncmoss'))
 project_dir  = os.path.abspath(os.path.join(SPECPATH, '..'))
 tests_dir    = os.path.abspath(os.path.join(SPECPATH, '..', 'tests'))
 
-datas = scipy_data + llvmlite_data
+# Application resources (icons/, parameters/, themes, etc.) are copied into the
+# app bundle by macos_bundle.py after the build.
+datas = llvmlite_data + qt_plugin_data
 
-# SYNCmoss only uses PySide6.QtWidgets / QtGui / QtCore. Excluding the large,
-# unused Qt frameworks (WebEngine, Quick/QML, 3D, Multimedia, Charts, ...) keeps
-# excludes win over collect_submodules above, so they are pruned from the bundle.
-# This matters most on macOS, where the build is universal2 (two architectures)
-# and UPX compression is not applied. The CI "--test" smoke run guards against
-# accidentally excluding something the app actually needs.
+# Unused-Qt Python module excludes (belt-and-suspenders, since PySide6 is no
+# longer force-collected). The CI "--test" smoke run guards against over-excluding.
 qt_excludes = [
     'PySide6.QtWebEngineCore', 'PySide6.QtWebEngineWidgets', 'PySide6.QtWebEngineQuick',
     'PySide6.QtWebChannel', 'PySide6.QtWebSockets', 'PySide6.QtWebView',
@@ -42,6 +61,15 @@ qt_excludes = [
     'PySide6.QtUiTools', 'PySide6.QtNetworkAuth', 'PySide6.QtRemoteObjects',
     'PySide6.QtTextToSpeech', 'PySide6.QtScxml', 'PySide6.QtStateMachine',
 ]
+# scipy is only used for scipy.linalg.eig; exclude the big unused subpackages.
+# (linalg, _lib, special and sparse are kept: scipy.linalg's import chain may
+# touch special/sparse.)
+scipy_excludes = [
+    'scipy.stats', 'scipy.optimize', 'scipy.spatial', 'scipy.interpolate',
+    'scipy.integrate', 'scipy.fft', 'scipy.fftpack', 'scipy.ndimage',
+    'scipy.signal', 'scipy.io', 'scipy.cluster', 'scipy.odr',
+    'scipy.datasets', 'scipy.misc',
+]
 # pytest is only used by the source test-suite; it must not be pulled into the
 # frozen binary (the smoke driver imports it lazily / guarded).
 other_excludes = ['tkinter', 'PyQt5', 'PyQt6', 'PySide2', 'pytest', '_pytest', 'pluggy']
@@ -53,7 +81,9 @@ a = Analysis(
     pathex=[project_dir, tests_dir],
     hooksconfig={
         'matplotlib': {
-            'backends': 'all',
+            # Only the backends SYNCmoss uses (Qt for the GUI, Agg/SVG/PDF for
+            # saving). 'all' pulls every backend incl. the tk one.
+            'backends': ['Agg', 'QtAgg', 'SVG', 'PDF'],
         },
     },
     binaries=[],
@@ -61,7 +91,7 @@ a = Analysis(
     hiddenimports=hiddenimports,
     hookspath=[],
     runtime_hooks=[],
-    excludes=qt_excludes + other_excludes,
+    excludes=qt_excludes + scipy_excludes + other_excludes,
     cipher=block_cipher,
     noarchive=False,
 )
@@ -76,9 +106,9 @@ exe_gui = EXE(
     name='SYNCmoss',
     debug=False,
     bootloader_ignore_signals=False,
-    strip=True,
+    strip=False,
     upx=False,
-    console=True,
+    console=False,
 )
 
 coll = COLLECT(
@@ -86,7 +116,7 @@ coll = COLLECT(
     a.binaries,
     a.zipfiles,
     a.datas,
-    strip=True,
+    strip=False,
     upx=False,
     upx_exclude=[],
     name='SYNCmoss',

{syncmoss-0.2.0 → syncmoss-0.2.1}/bundle/Windows.spec

@@ -3,26 +3,35 @@ from PyInstaller.utils.hooks import collect_data_files, collect_submodules
 import os
 
 # ── Hidden imports ──────────────────────────────────────────────
-hiddenimports = collect_submodules('scipy')
-hiddenimports += collect_submodules('PySide6')
-# Ensure numba and llvmlite submodules are included in the frozen app
-hiddenimports += collect_submodules('numba')
+# numba/llvmlite/scipy do a lot of dynamic importing, so collect their submodules
+# (this keeps core modules like scipy._cyutility that the hooks miss). The big
+# unused scipy subpackages are pruned again via scipy_excludes below; numba's own
+# test-suite is filtered out (not needed at runtime, and it emits a wall of
+# "hidden import not found" warnings for its CUDA tests).
+hiddenimports = collect_submodules('numba', filter=lambda name: 'tests' not in name)
 hiddenimports += collect_submodules('llvmlite')
+hiddenimports += collect_submodules('scipy')
+# Only the Qt modules SYNCmoss actually uses. We deliberately do NOT
+# collect_submodules('PySide6'): that drags in the QtQuick / QtQml / Qt3D /
+# WebEngine frameworks (100+ MB) the app never uses. The PySide6 PyInstaller
+# hook bundles the Qt frameworks/plugins matching just these imports.
+hiddenimports += ['PySide6.QtCore', 'PySide6.QtGui', 'PySide6.QtWidgets']
 # GUI smoke driver lives in tests/syncmoss_test.py; bundling it lets the frozen
 # binary self-test via `SYNCmoss --test` (see syncmoss/main.py).
 hiddenimports += ['syncmoss_test']
-scipy_data = collect_data_files('scipy')
-# llvmlite carries native data/bitcode that should be collected
+
+# scipy is only needed for scipy.linalg.eig (the import-time "dummy" in
+# models.py); scipy_excludes below drops the big unused subpackages.
+# llvmlite carries native data/bitcode that must be collected.
 llvmlite_data = collect_data_files('llvmlite')
 
 syncmoss_dir = os.path.abspath(os.path.join(SPECPATH, '..', 'syncmoss'))
 project_dir  = os.path.abspath(os.path.join(SPECPATH, '..'))
 tests_dir    = os.path.abspath(os.path.join(SPECPATH, '..', 'tests'))
 
-# Only Python library data (scipy, etc.) goes through PyInstaller.
-# Application resources (icons/, parameters/, themes, etc.) are copied
-# next to the .exe by bundle.py after the build.
-datas = scipy_data + llvmlite_data
+# Application resources (icons/, parameters/, themes, etc.) are copied next to
+# the .exe by bundle.py after the build.
+datas = llvmlite_data
 
 # SYNCmoss only uses PySide6.QtWidgets / QtGui / QtCore. Excluding the large,
 # unused Qt frameworks keeps the bundle small; excludes win over the
@@ -44,6 +53,15 @@ qt_excludes = [
     'PySide6.QtUiTools', 'PySide6.QtNetworkAuth', 'PySide6.QtRemoteObjects',
     'PySide6.QtTextToSpeech', 'PySide6.QtScxml', 'PySide6.QtStateMachine',
 ]
+# scipy is only used for scipy.linalg.eig; exclude the big unused subpackages.
+# (linalg, _lib, special and sparse are kept: scipy.linalg's import chain may
+# touch special/sparse.)
+scipy_excludes = [
+    'scipy.stats', 'scipy.optimize', 'scipy.spatial', 'scipy.interpolate',
+    'scipy.integrate', 'scipy.fft', 'scipy.fftpack', 'scipy.ndimage',
+    'scipy.signal', 'scipy.io', 'scipy.cluster', 'scipy.odr',
+    'scipy.datasets', 'scipy.misc',
+]
 # pytest is only used by the source test-suite; it must not be pulled into the
 # frozen binary (the smoke driver imports it lazily / guarded).
 other_excludes = ['tkinter', 'PyQt5', 'PyQt6', 'PySide2', 'pytest', '_pytest', 'pluggy']
@@ -55,7 +73,9 @@ a = Analysis(
     pathex=[project_dir, tests_dir],
     hooksconfig={
         'matplotlib': {
-            'backends': 'all',
+            # Only the backends SYNCmoss uses (Qt for the GUI, Agg/SVG/PDF for
+            # saving). 'all' pulls every backend incl. the tk one.
+            'backends': ['Agg', 'QtAgg', 'SVG', 'PDF'],
         },
     },
     binaries=[],
@@ -63,7 +83,7 @@ a = Analysis(
     hiddenimports=hiddenimports,
     hookspath=[],
     runtime_hooks=[],
-    excludes=qt_excludes + other_excludes,
+    excludes=qt_excludes + scipy_excludes + other_excludes,
     cipher=block_cipher,
     noarchive=False,
 )

{syncmoss-0.2.0 → syncmoss-0.2.1}/syncmoss/main.py

@@ -3,7 +3,7 @@ import sys
 import multiprocessing as mp
 from PySide6.QtWidgets import QApplication
 from syncmoss.syncmoss_main import PhysicsApp
-__VERSION__ = "0.2.0"
+__VERSION__ = "0.2.1"
 
 
 def _run_gui_smoke():