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 43a6e84cd..11d846d13 100644 --- a/environment.yml +++ b/environment.yml @@ -1,8 +1,10 @@ -name: saltproc-env +name: saltproc-env-test channels: - conda-forge - defaults dependencies: + - python<3.12 + - openmc - numpy - pytables - networkx @@ -10,5 +12,5 @@ dependencies: - pytest - jsonschema - pip: - - serpentTools - - argparse==1.4.0 + - git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git + - argparse 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