From 178c6da55d9a2dccaf2baee3ce38d34ac7155feb Mon Sep 17 00:00:00 2001
From: Sam Dotson <samgdotson@gmail.com>
Date: Wed, 15 Jan 2025 16:06:27 -0500
Subject: [PATCH 1/5] updates serpent tools dependency and pins python version

---
 environment.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index 43a6e84cd..f343bce71 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,6 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
+  - python < 3.12
   - numpy
   - pytables
   - networkx
@@ -10,5 +11,5 @@ dependencies:
   - pytest
   - jsonschema
   - pip:
-    - serpentTools
+    - git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git
     - argparse==1.4.0

From 52df08b9e34d869d3537a9cd58d0c92968eea99b Mon Sep 17 00:00:00 2001
From: Sam Dotson <samgdotson@gmail.com>
Date: Wed, 15 Jan 2025 16:24:42 -0500
Subject: [PATCH 2/5] updates requirements.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 60e68107a..a4fefd60f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,4 +6,4 @@ openmc
 pytables
 networkx
 pydot
-serpentTools
+git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git

From f5af24e0b8b702f4d30ac1dce8ee696c0fdd21db Mon Sep 17 00:00:00 2001
From: Sam Dotson <samgdotson@gmail.com>
Date: Wed, 15 Jan 2025 16:42:05 -0500
Subject: [PATCH 3/5] removes python version

---
 environment.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/environment.yml b/environment.yml
index f343bce71..35475bce9 100644
--- a/environment.yml
+++ b/environment.yml
@@ -3,7 +3,6 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python < 3.12
   - numpy
   - pytables
   - networkx

From 96eebdf44bca023807dcd52a46e406358c45e5db Mon Sep 17 00:00:00 2001
From: yardasol <oyardas2@illinois.edu>
Date: Mon, 20 Jan 2025 10:53:15 -0600
Subject: [PATCH 4/5] restrict python version and unrestrict argparse

---
 environment.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/environment.yml b/environment.yml
index 35475bce9..e6a3f6017 100644
--- a/environment.yml
+++ b/environment.yml
@@ -1,8 +1,9 @@
-name: saltproc-env
+name: saltproc-env-test
 channels:
   - conda-forge
   - defaults
 dependencies:
+  - python<3.12
   - numpy
   - pytables
   - networkx
@@ -11,4 +12,4 @@ dependencies:
   - jsonschema
   - pip:
     - git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git
-    - argparse==1.4.0
+    - argparse

From 7179671d469a5a04b4d7f24e67632a524fa65392 Mon Sep 17 00:00:00 2001
From: yardasol <oyardas2@illinois.edu>
Date: Mon, 20 Jan 2025 11:39:03 -0600
Subject: [PATCH 5/5] remove openmc source installation

---
 .github/workflows/cache-dependencies.yml | 36 ------------------------
 .github/workflows/test-saltproc.yml      |  2 +-
 environment.yml                          |  1 +
 3 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/cache-dependencies.yml b/.github/workflows/cache-dependencies.yml
index 54a278c4e..7648fdfda 100644
--- a/.github/workflows/cache-dependencies.yml
+++ b/.github/workflows/cache-dependencies.yml
@@ -50,7 +50,6 @@ jobs:
         with:
           path: |
             /usr/share/miniconda3/envs/saltproc-env
-            ~/openmc_src
             ~/endfb71_hdf5
             ~/.cache/pip
           key: depcache-${{ hashFiles('environment.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
@@ -64,27 +63,6 @@ jobs:
         if: steps.dependencies-cache.outputs.cache-hit != 'true'
         run: $GITHUB_WORKSPACE/scripts/ci/openmc-xs.bash
       
-      - name: OpenMC dependencies
-        run: |
-          sudo apt -y update
-          sudo apt install -y libhdf5-dev
-
-      - name: Download OpenMC
-        if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v4
-        with: 
-          repository: openmc-dev/openmc
-          path: openmc
-          submodules: recursive
-          
-      - name: Build OpenMC from source if no cache if found
-        if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        run: $GITHUB_WORKSPACE/tools/ci/build-openmc.sh
-
-      - name: Restore OpenMC source build from cache
-        if: steps.dependencies-cache.outputs.cache-hit == 'true'
-        run: $GITHUB_WORKSPACE/tools/ci/restore-openmc.sh
-          
       - name: Install SaltProc
         run: pip install .
 
@@ -128,20 +106,6 @@ jobs:
         run: mamba env update -n saltproc-doc-env -f doc/doc-environment.yml
         if: steps.dependencies-cache.outputs.cache-hit != 'true'
 
-      - name: Download OpenMC
-        if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v4
-        with: 
-          repository: openmc-dev/openmc
-          path: openmc
-
-      - name: Build OpenMC API
-        if: steps.dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          cd openmc
-          pip install .
-          cd ../
-
       - name: Install SaltProc
         run: pip install .
 
diff --git a/.github/workflows/test-saltproc.yml b/.github/workflows/test-saltproc.yml
index ee046b932..46dba4454 100644
--- a/.github/workflows/test-saltproc.yml
+++ b/.github/workflows/test-saltproc.yml
@@ -14,7 +14,7 @@ on:
   workflow_dispatch:
 
 env:
-  CACHE_NUMBER: 6 #change to manually reset cache
+  CACHE_NUMBER: 0 #change to manually reset cache
 
 jobs:
   test-saltproc:
diff --git a/environment.yml b/environment.yml
index e6a3f6017..11d846d13 100644
--- a/environment.yml
+++ b/environment.yml
@@ -4,6 +4,7 @@ channels:
   - defaults
 dependencies:
   - python<3.12
+  - openmc
   - numpy
   - pytables
   - networkx