Merge branch 'develop' into fluka-cern

.github/workflows/windows_build_test.yml

@@ -39,7 +39,7 @@ jobs:
     runs-on: windows-2019
     steps:
 
-      - uses: conda-incubator/setup-miniconda@v2
+      - uses: conda-incubator/setup-miniconda@v3
         with:
           auto-activate-base: true
           activate-environment: ""
@@ -89,7 +89,9 @@ jobs:
           cmake --build . --config Release
           cmake --install . --config Release
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
 
       - name: build DAGMC
         shell: bash -l {0}

doc/CHANGELOG.rst

@@ -10,13 +10,17 @@ Next version
 **Changed:**
 
   * Update hdf5 to v1.14.3 from v1.10.4 (#931 #933)
-  * Ensure implicit complement handle is placed at the back of DAGMC volume indices (#935)
   * Update MOAB to 5.5.1 from 5.3.0 (#939 #940)
   * Update README regarding OpenMC (#938)
   * Simplify Housekeeping Process for DAGMC (#943)
   * Allow Double Down v1.1.0 Installation in Dockerfile (#929 #944 #949)
   * Inline documentation improvements (#945)
   * Streamline dependencies of docker CI images (#951 #952)
+  * Update github actions to newer versions as necessary (#958)
+
+**Fixed:**
+
+  * Ensure implicit complement handle is placed at the back of DAGMC volume indices (#935)
   * Fixed to reflect FLUKA-CERN (#677)
 
 v3.2.3

src/pyne/CMakeLists.txt

@@ -1,7 +1,7 @@
 message("")
 
 if(MSVC)
-  execute_process(COMMAND C:/Program Files/Git/bin/bash.EXE -c 
+  execute_process(COMMAND bash -c 
                         "${CMAKE_CURRENT_SOURCE_DIR}/amalgamate_pyne.sh ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}"
                         RESULT_VARIABLE STATUS 
                         OUTPUT_VARIABLE OUTPUT)