Update all env scripts and yml files to suppress qscintilla 2 :-/

willend · willend · commit a4276065b986 · 2026-03-19T11:25:24.000+01:00
diff --git a/devel/bin/mccode-create-conda-yml b/devel/bin/mccode-create-conda-yml
@@ -29,7 +29,7 @@ def create_deplist( cfg ):
 
     pyqt_with_version = 'pyqt6'
     if cfg.include_mcgui:
-        deps += [pyqt_with_version,'qscintilla2']
+        deps += [pyqt_with_version] # Qscintilla2 is disabled for now... ,'qscintilla2']
     if cfg.include_vis:
         deps += ['matplotlib-base',
                  'tornado >=5',
diff --git a/environment.yml b/environment.yml
@@ -16,15 +16,15 @@ dependencies:
   - gsl
   - pyaml
   - ply
-  - matplotlib
+  - matplotlib-base
   - numpy
   - tornado
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt
+  - pyqt6
   - qtpy
-  - qscintilla2
+#  - qscintilla2
   - nexus
   - nexusformat
   - nexpy
diff --git a/mcstas-environment.yml b/mcstas-environment.yml
@@ -16,16 +16,16 @@ dependencies:
   - gsl
   - pyaml
   - ply
-  - matplotlib
+  - matplotlib-base
   - numpy
   - scipy
   - tornado
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt
+  - pyqt6
   - qtpy
-  - qscintilla2
+  #- qscintilla2
   - nexusformat
   - nexpy
   - hdf5
diff --git a/mcxtrace-environment.yml b/mcxtrace-environment.yml
@@ -16,16 +16,16 @@ dependencies:
   - gsl
   - pyaml
   - ply
-  - matplotlib
+  - matplotlib-base
   - numpy
   - scipy
   - tornado
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt
+  - pyqt6
   - qtpy
-  - qscintilla2
+  #- qscintilla2
   - nexusformat
   - nexpy
   - hdf5
diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml
@@ -21,9 +21,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt
+  - pyqt6
   - qtpy
-  - qscintilla2
+  #- qscintilla2
   - nexus
   - nexusformat
   - nexpy
diff --git a/meta-pkgs/windows/mcstas-environment.yml b/meta-pkgs/windows/mcstas-environment.yml
@@ -20,9 +20,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt
+  - pyqt6
   - qtpy
-  - qscintilla2
+  #- qscintilla2
   - nexus
   - nexusformat
   - nexpy
diff --git a/meta-pkgs/windows/mcxtrace-environment.yml b/meta-pkgs/windows/mcxtrace-environment.yml
@@ -20,9 +20,9 @@ dependencies:
   - scipy
   - pillow
   - pyqtgraph
-  - pyqt
+  - pyqt6
   - qtpy
-  - qscintilla2
+  #- qscintilla2
   - nexus
   - nexusformat
   - nexpy
