Merge pull request #1962 from mccode-dev/CI-windows-mcpl-2.0

Use mcpl 2.0 proper on Windows.

Author: willend

.github/workflows/mcstas-winbasictest-mingw.yml

@@ -52,10 +52,7 @@ jobs:
       run: choco install wget
 
     - name: pip install deps
-      run: pip install PyYAML ply McStasscript ncrystal mslex
-
-    - name: pip install mcpl-core preview
-      run: pip install -v "git+https://github.com/mctools/mcpl@path_to_mcpl2#subdirectory=mcpl_core"
+      run: pip install PyYAML ply McStasscript ncrystal mslex mcpl mcpl-core mcpl-extra
 
     - name: choco install deps2
       run: choco install mingw make winflexbison3

.github/workflows/mcstas-winbasictest-msvc.yml

@@ -98,14 +98,11 @@ jobs:
 
     - name: pip install deps Windows Intel
       if: runner.os == 'Windows' && matrix.os != 'windows-11-arm'
-      run: pip install PyYAML ply McStasscript ncrystal mslex
+      run: pip install PyYAML ply McStasscript ncrystal mslex mcpl mcpl-core mcpl-extra
 
     - name: pip install deps Windows arm64
       if: runner.os == 'Windows' && matrix.os == 'windows-11-arm'
-      run: pip install PyYAML ply ncrystal mslex
-
-    - name: pip install mcpl-core preview
-      run: pip install -v "git+https://github.com/mctools/mcpl@path_to_mcpl2#subdirectory=mcpl_core"
+      run: pip install PyYAML ply ncrystal mslex mcpl mcpl-core mcpl-extra
 
     - name: set MCSTAS env var
       run: echo MCSTAS=%CD%\install\share\mcstas\resources >> %GITHUB_ENV%

.github/workflows/mcxtrace-winbasictest-mingw.yml

@@ -52,10 +52,7 @@ jobs:
       run: choco install wget
 
     - name: pip install deps
-      run: pip install PyYAML ply McStasscript mslex
-
-    - name: pip install mcpl-core preview
-      run: pip install -v "git+https://github.com/mctools/mcpl@path_to_mcpl2#subdirectory=mcpl_core"
+      run: pip install PyYAML ply McStasscript mslex mcpl mcpl-core mcpl-extra
 
     - name: choco install deps2
       run: choco install mingw make winflexbison3

.github/workflows/mcxtrace-winbasictest-msvc.yml

@@ -98,11 +98,11 @@ jobs:
 
     - name: pip install deps Windows Intel
       if: runner.os == 'Windows' && matrix.os != 'windows-11-arm'
-      run: pip install PyYAML ply McStasscript ncrystal mslex
+      run: pip install PyYAML ply McStasscript mslex mcpl mcpl-core mcpl-extra
 
     - name: pip install deps Windows arm64
-      if: runner.os == 'Windows' && matrix.os == 'windows-11-arm'
-      run: pip install PyYAML ply ncrystal mslex
+      if: runner.os == 'Windows' && matrix.os == 'windows-11-arm' mcpl mcpl-core mcpl-extra
+      run: pip install PyYAML ply mslex
 
     - name: pip install mcpl-core preview
       run: pip install -v "git+https://github.com/mctools/mcpl@path_to_mcpl2#subdirectory=mcpl_core"