Merge pull request #1769 from willend/main

Potential fix for #1768
McStasMcXtrace · Nov 21, 2024 · e3f40d0 · e3f40d0
2 parents 89f3eb7 + 2598b78
commit e3f40d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml
@@ -11,7 +11,6 @@ dependencies:
   - msmpi
   - pyaml
   - ply
-  - matplotlib
   - numpy
   - tornado
   - scipy

diff --git a/tools/Python/mccodelib/pqtgfrontend.py b/tools/Python/mccodelib/pqtgfrontend.py
@@ -101,7 +101,11 @@ def __init__(self, plotgraph, sourcedir, plot_func, invcanvas):
 
         # start
         if hasattr(self.app, "exec_"):
-            self.isQt6 = False
+            try:
+                import PySide6
+                self.isQt6 = True
+            except:
+                self.isQt6 = False
         else:
             self.isQt6 = True
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ dependencies: @@
       - msmpi
       - pyaml
       - ply
-      - matplotlib
       - numpy
       - tornado
       - scipy
@@ Expand Down @@