Skip to content

Commit a5b15ae

Browse files
yardasolyardasol
committed
Merge remote-tracking branch 'upstream/master' into fix-gitignore
2 parents e08bff9 + a2f41fb commit a5b15ae

File tree

15 files changed

+180
-202
lines changed

15 files changed

+180
-202
lines changed

‎.github/workflows/auto-labels.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
shell: bash -l {0}
1717

1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v4
2020
- name: Remove Priority and Status labels
2121
run: |
2222
id=${{ github.event.issue.number }}
@@ -35,7 +35,7 @@ jobs:
3535
shell: bash -l {0}
3636

3737
steps:
38-
- uses: actions/checkout@v2
38+
- uses: actions/checkout@v4
3939
- name: Remove Priority and Status labels
4040
run: |
4141
id=${{ github.event.pull_reqeust.number }}

‎.github/workflows/cache-dependencies.yml‎

Lines changed: 4 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -27,33 +27,28 @@ jobs:
2727
LIBMESH: no
2828

2929
steps:
30-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
3131

3232
## TESTING CACHE ##
3333
# Setup conda
3434
- name: Set up conda
35-
uses: conda-incubator/setup-miniconda@v2
35+
uses: conda-incubator/setup-miniconda@v3
3636
with:
37-
miniforge-variant: Mambaforge # mamba is faster than base conda
3837
miniforge-version: latest
3938
activate-environment: saltproc-env
4039
use-mamba: true
41-
use-only-tar-bz2: true
4240
- run: |
4341
conda config --env --set pip_interop_enabled True
4442
4543
# check for existing cache
4644
- name: Set cache date
4745
run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
4846

49-
- uses: actions/cache@v3
47+
- uses: actions/cache@v4
5048
id: dependencies-cache
5149
with:
5250
path: |
53-
/usr/share/miniconda3/envs/saltproc-env
54-
~/openmc_src
5551
~/endfb71_hdf5
56-
~/.cache/pip
5752
key: depcache-${{ hashFiles('environment.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
5853

5954
# Install dependencies
@@ -65,27 +60,6 @@ jobs:
6560
if: steps.dependencies-cache.outputs.cache-hit != 'true'
6661
run: $GITHUB_WORKSPACE/scripts/ci/openmc-xs.bash
6762

68-
- name: OpenMC dependencies
69-
run: |
70-
sudo apt -y update
71-
sudo apt install -y libhdf5-dev
72-
73-
- name: Download OpenMC
74-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
75-
uses: actions/checkout@v3
76-
with:
77-
repository: openmc-dev/openmc
78-
path: openmc
79-
submodules: recursive
80-
81-
- name: Build OpenMC from source if no cache if found
82-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
83-
run: $GITHUB_WORKSPACE/tools/ci/build-openmc.sh
84-
85-
- name: Restore OpenMC source build from cache
86-
if: steps.dependencies-cache.outputs.cache-hit == 'true'
87-
run: $GITHUB_WORKSPACE/tools/ci/restore-openmc.sh
88-
8963
- name: Install SaltProc
9064
run: pip install .
9165

@@ -99,53 +73,4 @@ jobs:
9973
shell: bash -l {0}
10074

10175
steps:
102-
- uses: actions/checkout@v3
103-
104-
## DOCUMENTATION CACHE ##
105-
- name: Set up conda
106-
uses: conda-incubator/setup-miniconda@v2
107-
with:
108-
miniforge-variant: Mambaforge # mamba is faster than base conda
109-
miniforge-version: latest
110-
activate-environment: saltproc-doc-env
111-
use-mamba: true
112-
use-only-tar-bz2: true
113-
- run: |
114-
conda config --env --set pip_interop_enabled True
115-
116-
# check for existing cache
117-
- name: Set cache date
118-
run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
119-
120-
- uses: actions/cache@v3
121-
id: dependencies-cache
122-
with:
123-
path: |
124-
/usr/share/miniconda3/envs/saltproc-doc-env
125-
~/.cache/pip
126-
key: depcache-${{ hashFiles('doc/doc-environment.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
127-
128-
# Install dependencies
129-
- name: Update environment
130-
run: mamba env update -n saltproc-doc-env -f doc/doc-environment.yml
131-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
132-
133-
- name: Download OpenMC
134-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
135-
uses: actions/checkout@v3
136-
with:
137-
repository: openmc-dev/openmc
138-
path: openmc
139-
140-
- name: Build OpenMC API
141-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
142-
run: |
143-
cd openmc
144-
pip install .
145-
cd ../
146-
147-
- name: Install SaltProc
148-
run: pip install .
149-
150-
- name: Check packages
151-
run: conda list
76+
- uses: actions/checkout@v4

‎.github/workflows/deploy-docs.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,14 @@ jobs:
2323
shell: bash -l {0}
2424

2525
steps:
26-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2727
with:
2828
fetch-depth: 0
2929

3030
# Setup conda
3131
- name: Set up conda
32-
uses: conda-incubator/setup-miniconda@v2
32+
uses: conda-incubator/setup-miniconda@v3
3333
with:
34-
miniforge-variant: Mambaforge # mamba is faster than base conda
3534
miniforge-version: latest
3635
activate-environment: saltproc-doc-env
3736
use-mamba: true
@@ -43,7 +42,7 @@ jobs:
4342
- name: Set cache date
4443
run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
4544

46-
- uses: actions/cache@v2
45+
- uses: actions/cache@v4
4746
id: dependencies-cache
4847
with:
4948
path: |
@@ -68,7 +67,7 @@ jobs:
6867
cp doc/redirect.html doc/_build/html/index.html
6968
7069
- name: Deploy documentation to gh-pages branch
71-
uses: peaceiris/actions-gh-pages@v3
70+
uses: peaceiris/actions-gh-pages@v4
7271
with:
7372
github_token: ${{ secrets.GITHUB_TOKEN }}
7473
publish_dir: ./doc/_build/html

‎.github/workflows/populate-releasenotes.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ jobs:
1818
shell: bash -l {0}
1919

2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222

23-
- name: Set up Python 3.9
24-
uses: actions/setup-python@v2
23+
- name: Set up Python 3.10
24+
uses: actions/setup-python@v5
2525
with:
26-
python-version: 3.9
26+
python-version: 3.10
2727
- name: Add conda to system path
2828
run: |
2929
# $CONDA is an environment variable pointing to the root of the miniconda directory

‎.github/workflows/test-saltproc.yml‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
workflow_dispatch:
1515

1616
env:
17-
CACHE_NUMBER: 6 #change to manually reset cache
17+
CACHE_NUMBER: 0 #change to manually reset cache
1818

1919
jobs:
2020
test-saltproc:
@@ -33,66 +33,38 @@ jobs:
3333
LIBMESH: no
3434

3535
steps:
36-
- uses: actions/checkout@v3
36+
- uses: actions/checkout@v4
3737

3838
# Setup conda
3939
- name: Set up conda
40-
uses: conda-incubator/setup-miniconda@v2
40+
uses: conda-incubator/setup-miniconda@v3
4141
with:
42-
miniforge-variant: Mambaforge # mamba is faster than base conda
4342
miniforge-version: latest
4443
channels: conda-forge
4544
activate-environment: saltproc-env
4645
use-mamba: true
47-
use-only-tar-bz2: true
4846
- run: |
4947
conda config --env --set pip_interop_enabled True
5048
5149
# check for existing cache
5250
- name: Set cache date
5351
run: echo "DATE=$(date +'%Y%m%d')" >> $GITHUB_ENV
5452

55-
- uses: actions/cache@v3
53+
- uses: actions/cache@v4
5654
id: dependencies-cache
5755
with:
5856
path: |
59-
/usr/share/miniconda3/envs/saltproc-env
60-
~/openmc_src
61-
~/mcpl_src
6257
~/endfb71_hdf5
63-
~/.cache/pip
6458
key: depcache-${{ hashFiles('environment.yml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
6559

6660
# Install dependencies
6761
- name: Update environment
6862
run: mamba env update -n saltproc-env -f environment.yml
69-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
7063

7164
- name: Install OpenMC cross section library
7265
if: steps.dependencies-cache.outputs.cache-hit != 'true'
7366
run: $GITHUB_WORKSPACE/scripts/ci/openmc-xs.bash
7467

75-
- name: OpenMC dependencies
76-
run: |
77-
sudo apt -y update
78-
sudo apt install -y libhdf5-dev
79-
80-
- name: Download OpenMC
81-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
82-
uses: actions/checkout@v3
83-
with:
84-
repository: openmc-dev/openmc
85-
path: openmc
86-
submodules: recursive
87-
88-
- name: Build OpenMC from source if no cache is found
89-
if: steps.dependencies-cache.outputs.cache-hit != 'true'
90-
run: $GITHUB_WORKSPACE/tools/ci/build-openmc.sh
91-
92-
- name: Restore OpenMC source build from cache
93-
if: steps.dependencies-cache.outputs.cache-hit == 'true'
94-
run: $GITHUB_WORKSPACE/tools/ci/restore-openmc.sh
95-
9668
- name: Install SaltProc
9769
run: pip install .
9870

‎doc/releasenotes/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Release Notes
77
.. toctree::
88
:maxdepth: 1
99

10+
v0.6.0
1011
v0.5.0
1112
v0.4.0
1213
v0.3.0

‎doc/releasenotes/v0.6.0.rst‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
========================
2+
Release notes for v0.6.0
3+
========================
4+
5+
.. note:: These release notes are currently in production.
6+
7+
..
8+
When documenting a bug fix or feature, please do so in the following format
9+
10+
..
11+
- `Fixed typo in depcode.py <https://github.com/arfc/saltproc/pull/xx>`_ by @pr_author_username
12+
13+
..
14+
Links to packages/issues/bug fixes/contributors/reviewers
15+
16+
17+
18+
19+
Summary
20+
=======
21+
22+
..
23+
Describe generally the features of this release
24+
25+
26+
27+
28+
Dependency Changes
29+
==================
30+
31+
..
32+
Describe any new/removed/modified package dependencies
33+
34+
35+
36+
37+
New Features
38+
============
39+
40+
..
41+
Describe any new features to the code.
42+
43+
44+
45+
46+
Bug Fixes
47+
=========
48+
49+
..
50+
Describe any bug fixes.
51+
52+
53+
54+
55+
Script Changes
56+
==============
57+
58+
..
59+
Describe any script additions/modifications/removals
60+
61+
62+
63+
64+
Python API Changes
65+
==================
66+
67+
..
68+
Describe any changes to the API
69+
70+
71+
72+
73+
Contributors
74+
============
75+
..
76+
List of people who contributed features and fixes to this release
77+
78+
The following people contributed code to this release of SaltProc:
79+
80+
..
81+
`@gh_username <https://github.com/gh_uname>`_
82+
83+
84+
85+
86+
Reviewers
87+
=========
88+
..
89+
List of people who reviewed PRs for this release
90+
91+
The following people reviewed code for this release of SaltProc:
92+
93+
..
94+
`@gh_username <https://github.com/gh_uname>`_
95+
96+

‎environment.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ channels:
33
- conda-forge
44
- defaults
55
dependencies:
6+
- python
7+
- openmc>=0.14.0
68
- numpy
79
- pytables
810
- networkx
911
- pydot
1012
- pytest
1113
- jsonschema
1214
- pip:
13-
- serpentTools
14-
- argparse==1.4.0
15+
- git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git
16+
- argparse

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ openmc
66
pytables
77
networkx
88
pydot
9-
serpentTools
9+
git+https://github.com/CORE-GATECH-GROUP/serpent-tools.git

0 commit comments

Comments
 (0)