Skip to content

Commit

Permalink
Merge pull request #913 from svalinn/v3.2.3-rc1
Browse files Browse the repository at this point in the history
Updates to allow a release
  • Loading branch information
pshriwise authored Dec 18, 2023
2 parents 6b30af4 + 72c07ff commit 4303ac5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ enable_language(CXX)
# Set DAGMC version
set(DAGMC_MAJOR_VERSION 3)
set(DAGMC_MINOR_VERSION 2)
set(DAGMC_PATCH_VERSION 2)
set(DAGMC_PATCH_VERSION 3)
set(DAGMC_VERSION ${DAGMC_MAJOR_VERSION}.${DAGMC_MINOR_VERSION}.${DAGMC_PATCH_VERSION})

if(MSVC)
Expand Down
3 changes: 3 additions & 0 deletions doc/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ DAGMC Changelog
Next version
====================

v3.2.3
====================

**Changed:**

* Improvements/corrections to graveyard capabilities (#855)
Expand Down
2 changes: 1 addition & 1 deletion src/pyne/pyne
Submodule pyne updated 87 files
+44 −0 .github/actions/build-test/action.yml
+0 −31 .github/actions/login-buildx-cache/action.yml
+28 −70 .github/workflows/build_test.yml
+87 −237 .github/workflows/docker_publish.yml
+35 −0 .github/workflows/install_script.yml
+101 −0 .github/workflows/virtualbox_image.yml
+20 −5 CHANGELOG.rst
+0 −165 docker/ubuntu_20.04-dev.dockerfile
+176 −0 docker/ubuntu_22.04-dev.dockerfile
+6 −6 docs/devsguide/testing.rst
+1 −1 pyne/dagmc.pyx
+2 −1 pyne/endf.pyx
+12 −11 pyne/mesh.py
+1 −1 pyne/openmc_utils.py
+26 −20 pyne/utils.py
+2 −2 pyne/xs/cache.py
+5 −5 pyne/xs/channels.py
+1 −0 pyne/xs/data_source.py
+9 −9 readme.rst
+241 −0 scripts/ubuntu.sh
+12 −12 src/data.cpp
+2 −2 src/enrichment.cpp
+3 −3 src/material.cpp
+13 −0 src/rxname.cpp
+0 −12 src/utils.h
+3 −3 tests/ci-run-tests.sh
+37 −37 tests/test_ace.py
+20 −17 tests/test_activation_responses.py
+2 −7 tests/test_ahot.py
+56 −59 tests/test_alara.py
+4 −6 tests/test_binaryreader.py
+13 −26 tests/test_bins.py
+22 −23 tests/test_cccc.py
+62 −68 tests/test_cram.py
+76 −72 tests/test_dagmc.py
+129 −150 tests/test_data.py
+13 −21 tests/test_data_checksums.py
+10 −14 tests/test_data_nofile.py
+2 −15 tests/test_decay.py
+0 −14 tests/test_dtypes.py
+16 −22 tests/test_endf.py
+0 −5 tests/test_endl.py
+106 −123 tests/test_enrichment.py
+16 −24 tests/test_ensdf.py
+13 −16 tests/test_ensdf_processing.py
+80 −82 tests/test_fispact.py
+58 −62 tests/test_fluka.py
+23 −37 tests/test_fortran.py
+144 −156 tests/test_jsoncpp.py
+664 −697 tests/test_material.py
+6 −13 tests/test_material_data_external.py
+6 −13 tests/test_material_data_internal.py
+26 −37 tests/test_materials_library.py
+301 −339 tests/test_mcnp.py
+108 −124 tests/test_mesh.py
+370 −410 tests/test_nucname.py
+28 −31 tests/test_openmc_utils.py
+173 −191 tests/test_origen22.py
+59 −75 tests/test_particle.py
+72 −67 tests/test_partisn.py
+34 −31 tests/test_r2s.py
+122 −134 tests/test_rxname.py
+22 −23 tests/test_serpent.py
+6 −23 tests/test_source.py
+72 −90 tests/test_source_sampling.py
+51 −55 tests/test_spectrometry.py
+188 −202 tests/test_stlcontainers.py
+65 −87 tests/test_tally.py
+4 −10 tests/test_transmuters.py
+2 −15 tests/test_tutorial_notebooks.py
+76 −85 tests/test_utils.py
+3 −4 tests/test_variancereduction.py
+9 −28 tests/transmute/test_chainsolve.py
+14 −21 tests/xs/test_cache.py
+25 −31 tests/xs/test_channels.py
+20 −27 tests/xs/test_data_source.py
+31 −37 tests/xs/test_models.py
+35 −33 tutorial/00-intro.ipynb
+15 −13 tutorial/01-nuclide-naming.ipynb
+219 −153 tutorial/02-materials.ipynb
+297 −124 tutorial/03-nuclear-data.ipynb
+43 −93 tutorial/04-reaction_names.ipynb
+148 −147 tutorial/05-cross-sections.ipynb
+25 −55 tutorial/06-transmutation.ipynb
+104 −98 tutorial/07-mesh-basics.ipynb
+4 −1 tutorial/09-outro.ipynb
+729 −691 tutorial/10-spatial-solver.ipynb

0 comments on commit 4303ac5

Please sign in to comment.