Merge branch 'develop' into scikit-build-core

pyne · May 23, 2024 · 65859b9 · 65859b9
2 parents 4f6061f + 7e38b25
commit 65859b9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,9 +10,9 @@ src/atomic_data.h
 src/*.tar.gz
 *.s
 
-# Ignore Python environment
-env
+# Ignore environment
 .env
+.venv
 
 # Ignore temp files
 *.pyc

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,6 +16,7 @@ Next Version
       * do not try to download missing (super heavy) data from KAERI
       * update material_library writing interface
    * reference python_executable rather than assuming `python` exists ()
+   * Update FindMOAB to use MOAB config file (#1526)
 
 v0.7.8
 ======

diff --git a/cmake/FindDAGMC.cmake b/cmake/FindDAGMC.cmake
diff --git a/cmake/FindMOAB.cmake b/cmake/FindMOAB.cmake