Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 9 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,14 @@ jobs:
run: |
pip install git+https://github.com/openmc-dev/openmc.git@v0.15.0#egg=openmc

# Cap version also for python 11
- name: Install openmc (legacy)
if: runner.os == 'Linux' && matrix.python-version == '3.11'
run: |
pip install git+https://github.com/openmc-dev/openmc.git@3b5ac08bfb754ef93ff3db12fcda2ecbd0dbe464

- name: Install openmc
if: runner.os == 'Linux' && matrix.python-version != '3.10'
if: runner.os == 'Linux' && matrix.python-version != '3.10' && matrix.python-version != '3.11'
run: |
pip install git+https://github.com/openmc-dev/openmc.git

Expand Down Expand Up @@ -98,8 +104,8 @@ jobs:

# Upload coverage to Codecov. Do it only for one case of the matrix.
- name: Upload coverage to Codecov
# do it only once for python 3.10
if: matrix.python-version == '3.11' && matrix.os == 'ubuntu-latest'
# do it only once for python 3.12
if: matrix.python-version == '3.12' && matrix.os == 'ubuntu-latest'
uses: codecov/codecov-action@v4
with:
verbose: true
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies = [
"matplotlib",
"aspose-words",
"requests",
"f4enix >= 0.18.0",
"f4enix >= 0.19.0",
Comment thread
dodu94 marked this conversation as resolved.
"pyyaml",
"seaborn",
"python-gitlab"
Expand Down
2 changes: 1 addition & 1 deletion src/jade/run/input.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from f4enix.input.materials import MatCardsList, Material, SubMaterial, Zaid
from f4enix.input.MCNPinput import D1S_Input
from f4enix.input.MCNPinput import Input as MCNPInput
from f4enix.input.irradiation import Nuclide
from f4enix.core.irradiation import Nuclide

from jade.config.run_config import Library, LibraryD1S, LibraryMCNP
from jade.helper.__optionals__ import OMC_AVAIL
Expand Down