Merge pull request #1834 from HEXRD/unpin-pyside6

Unpin PySide6

Author: psavery

conda.recipe/meta.yaml

@@ -28,12 +28,7 @@ requirements:
     - pyhdf
     # This next one is needed to fix the app name on Mac
     - pyobjc-framework-cocoa  # [osx]
-    # Lock the PySide6 version to be less than 6.8 for Mac.
-    # This is because Qt 6.8 has some crashing issue we need
-    # to resolve. This issue is tracked in:
-    # https://github.com/HEXRD/hexrdgui/issues/1931
-    - pyside6<6.8  # [osx]
-    - pyside6  # [not osx]
+    - pyside6
     - pyyaml
     - silx-base
 

setup.py

@@ -8,9 +8,7 @@
     'fabio>=0.11',
     'matplotlib',
     'Pillow',
-    # PySide 6.8.0 is causing segmentation faults in the testing
-    # Keep this version downgraded until that is fixed.
-    'pyside6<6.8.0',
+    'pyside6',
     'pyyaml',
     'silx',
 ]

tests/conftest.py

@@ -1,9 +1,11 @@
+import gc
 import os
 from pathlib import Path
 
 import pytest
 
 from PySide6.QtCore import QSettings
+from PySide6.QtWidgets import QApplication
 
 from hexrdgui.main_window import MainWindow
 
@@ -41,3 +43,25 @@ def main_window(qtbot):
     window.confirm_application_close = False
     qtbot.addWidget(window.ui)
     return window
+
+
+# This next fixture is necessary starting in Qt 6.8, to ensure
+# all Qt objects are destroyed before Python finalizes.
+# This may not be required anymore after we drop support
+# for Python 3.11. The Python3.14 tests pass without it. We
+# can try removing this after we drop support of Python versions.
+@pytest.fixture(scope="session", autouse=True)
+def cleanup_qt():
+    """Clean up Qt objects before Python finalizes."""
+    yield
+    # After all tests complete, before Python exits
+    app = QApplication.instance()
+    if app:
+        # Close all windows
+        for widget in app.topLevelWidgets():
+            widget.close()
+            widget.deleteLater()
+        # Process pending events
+        app.processEvents()
+    # Force garbage collection
+    gc.collect()