Merge pull request #2362 from mccode-dev/workflow-updates

Workflow and dependency updates

Author: willend

.github/workflows/mcstas-autobuild.yml

@@ -122,7 +122,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcstas-artefacts-${{ matrix.os }}

.github/workflows/mcstas-basictest.yml

@@ -617,7 +617,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcstas-artefacts-${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}

.github/workflows/mcstas-conda-basictest.yml

@@ -44,7 +44,7 @@ jobs:
       if: runner.os == 'Windows'
       uses: ilammy/msvc-dev-cmd@v1
 
-    - uses: conda-incubator/setup-miniconda@v3
+    - uses: conda-incubator/setup-miniconda@v3.3.0
       with:
         activate-environment: mcstas
         auto-update-conda: true
@@ -293,7 +293,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcstas-artefacts-${{ matrix.os }}.${{ matrix.mpi }}.python-${{ matrix.python }}

.github/workflows/mcstas-conda-testsuite.yml

@@ -41,7 +41,7 @@ jobs:
       if: runner.os == 'Windows'
       uses: ilammy/msvc-dev-cmd@v1
 
-    - uses: conda-incubator/setup-miniconda@v3
+    - uses: conda-incubator/setup-miniconda@v3.3.0
       with:
         activate-environment: mcstas
         auto-update-conda: true
@@ -123,7 +123,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcstas-artefacts-${{ matrix.os }}.${{ matrix.mpi }}.python-${{ matrix.python }}

.github/workflows/mcxtrace-autobuild.yml

@@ -122,7 +122,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcxtrace-artefacts-${{ matrix.os }}

.github/workflows/mcxtrace-basictest.yml

@@ -533,7 +533,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcxtrace-artefacts-${{ matrix.os }}.${{ matrix.CC }}.${{ matrix.mpi }}.python-${{ matrix.python }}

.github/workflows/mcxtrace-conda-basictest.yml

@@ -44,7 +44,7 @@ jobs:
       if: runner.os == 'Windows'
       uses: ilammy/msvc-dev-cmd@v1
 
-    - uses: conda-incubator/setup-miniconda@v3
+    - uses: conda-incubator/setup-miniconda@v3.3.0
       with:
         activate-environment: mcxtrace
         auto-update-conda: true
@@ -274,7 +274,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcxtrace-artefacts-${{ matrix.os }}.${{ matrix.mpi }}.python-${{ matrix.python }}

.github/workflows/mcxtrace-conda-testsuite.yml

@@ -41,7 +41,7 @@ jobs:
       if: runner.os == 'Windows'
       uses: ilammy/msvc-dev-cmd@v1
 
-    - uses: conda-incubator/setup-miniconda@v3
+    - uses: conda-incubator/setup-miniconda@v3.3.0
       with:
         activate-environment: mcxtrace
         auto-update-conda: true
@@ -123,7 +123,7 @@ jobs:
 
     - name: 'Upload Artifact'
       id: tar-upload
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v6
       if: always()
       with:
         name: mcxtrace-artefacts-${{ matrix.os }}.${{ matrix.mpi }}.python-${{ matrix.python }}

devel/bin/mccode-create-conda-yml

@@ -27,11 +27,11 @@ def create_deplist( cfg ):
     if cfg.is_win:
         deps += ['mslex']
 
-    pyqt_with_version = 'pyqt >=5.10'
+    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',
+        deps += ['matplotlib-base',
                  'tornado >=5',
                  'scipy','pillow','pyqtgraph',
                  pyqt_with_version,

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