Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updates serpent tools dependency and pins python version #209

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

updates serpent tools dependency and pins python version #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
178c6da
updates serpent tools dependency and pins python version
samgdotson Jan 15, 2025
c0d11b6
Merge branch 'master' of github.com:arfc/saltproc into fix_deps
samgdotson Jan 15, 2025
52df08b
updates requirements.txt
samgdotson Jan 15, 2025
f5af24e
removes python version
samgdotson Jan 15, 2025
96eebdf
restrict python version and unrestrict argparse
yardasol Jan 20, 2025
7179671
remove openmc source installation
yardasol Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions .github/workflows/cache-dependencies.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 .

Expand Down Expand Up @@ -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 .

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-saltproc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 5 additions & 3 deletions environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
name: saltproc-env
name: saltproc-env-test
channels:
- conda-forge
- defaults
dependencies:
- python<3.12
- openmc
- numpy
- pytables
- networkx
- pydot
- pytest
- jsonschema
- pip:
- serpentTools
- argparse==1.4.0
- git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git
- argparse
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ openmc
pytables
networkx
pydot
serpentTools
git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git
Loading