Merge pull request #2385 from willend/main

willend · web-flow · commit df7933e094cf · 2026-04-07T21:12:32.000+02:00
Roll back to PyQt5/qtpy
diff --git a/cmake/support/run-scripts/mccode_errmsg.bat.in b/cmake/support/run-scripts/mccode_errmsg.bat.in
@@ -3,4 +3,4 @@
 
 @set ERRMSG="@FLAVOR@: %*"
 
-@python -c "import os;import PyQt6.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
+@python -c "import os;import qtpy.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
diff --git a/cmake/support/run-scripts/mccode_errmsg.in b/cmake/support/run-scripts/mccode_errmsg.in
@@ -10,4 +10,4 @@ export PATH=$PREFIX/@DEST_BINDIR@:$PATH
 ERRMSG=`echo $* | sed s/\ /\\ /g`
 export ERRMSG="@FLAVOR@: $ERRMSG"
 
-python3 -c "import os;import PyQt6.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
+python3 -c "import os;import qtpy.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"
diff --git a/devel/bin/mccode-create-conda-yml b/devel/bin/mccode-create-conda-yml
@@ -27,9 +27,9 @@ def create_deplist( cfg ):
     if cfg.is_win:
         deps += ['mslex']
 
-    pyqt_with_version = 'pyqt6'
+    pyqt_with_version = 'pyqt >=5'
     if cfg.include_mcgui:
-        deps += [pyqt_with_version] # Qscintilla2 is disabled for now... ,'qscintilla2']
+        deps += [pyqt_with_version, 'qscintilla2']
     if cfg.include_vis:
         deps += ['matplotlib-base',
                  'tornado >=5',
diff --git a/environment.yml b/environment.yml
@@ -23,7 +23,7 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt6
+  - pyqt
   - qtpy
 #  - qscintilla2
   - nexus
diff --git a/mcstas-environment.yml b/mcstas-environment.yml
@@ -24,9 +24,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt6
+  - pyqt
   - qtpy
-  #- qscintilla2
+  - qscintilla2
   - nexusformat
   - nexpy
   - hdf5
diff --git a/mcxtrace-environment.yml b/mcxtrace-environment.yml
@@ -24,9 +24,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt6
+  - pyqt
   - qtpy
-  #- qscintilla2
+  - qscintilla2
   - nexusformat
   - nexpy
   - hdf5
diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml
@@ -22,9 +22,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt6
+  - pyqt
   - qtpy
-  #- qscintilla2
+  - qscintilla2
   - nexus
   - nexusformat
   - nexpy
diff --git a/meta-pkgs/windows/mcstas-environment.yml b/meta-pkgs/windows/mcstas-environment.yml
@@ -21,9 +21,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt6
+  - pyqt
   - qtpy
-  #- qscintilla2
+  - qscintilla2
   - nexus
   - nexusformat
   - nexpy
diff --git a/meta-pkgs/windows/mcxtrace-environment.yml b/meta-pkgs/windows/mcxtrace-environment.yml
@@ -21,9 +21,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt6
+  - pyqt
   - qtpy
-  #- qscintilla2
+  - qscintilla2
   - nexus
   - nexusformat
   - nexpy

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`
`4`	`4`	`@set ERRMSG="@FLAVOR@: %*"`
`5`	`5`
`6`		`-@python -c "import os;import PyQt6.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"`
	`6`	`+@python -c "import os;import qtpy.QtWidgets as w; app = w.QApplication(['infobox']); w.QMessageBox.information(None, 'Infobox', os.getenv('ERRMSG'))"`