Skip to content

Commit 3ba402b

Browse files
author
Davide Laghi
committed
rename fetch function
1 parent 293d4dd commit 3ba402b

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/jade/app/app.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import jade.resources as res
1414
from jade import resources
15-
from jade.app.fetch import fetch_f4e_inputs, fetch_iaea_inputs, fetch_f4e_exp_data
15+
from jade.app.fetch import fetch_f4e_inputs, fetch_iaea_inputs, fetch_nonIAEA_exp_data
1616
from jade.config.paths_tree import PathsTree
1717
from jade.config.pp_config import PostProcessConfig
1818
from jade.config.raw_config import ConfigRawProcessor
@@ -99,7 +99,7 @@ def update_inputs(self):
9999
logging.error("Failed to update the IAEA benchmark inputs.")
100100

101101
# Install F4E exp data
102-
success = fetch_f4e_exp_data(self.tree.exp_data)
102+
success = fetch_nonIAEA_exp_data(self.tree.exp_data)
103103
if not success:
104104
logging.error("Failed to update the F4E experimental data.")
105105

src/jade/app/fetch.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,8 @@ def fetch_f4e_inputs(inputs_root: PathLike, access_token: str) -> bool:
224224
return success
225225

226226

227-
def fetch_f4e_exp_data(exp_data_root: PathLike) -> bool:
228-
"""Fetch F4E benchmark experimental data and copy them to
227+
def fetch_nonIAEA_exp_data(exp_data_root: PathLike) -> bool:
228+
"""Fetch non IAEA benchmark experimental data and copy them to
229229
the correct folder in jade structure. This will always override the available
230230
data.
231231

tests/app/test_fetch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import pytest
66

7-
from jade.app.fetch import fetch_f4e_inputs, fetch_iaea_inputs, fetch_f4e_exp_data
7+
from jade.app.fetch import fetch_f4e_inputs, fetch_iaea_inputs, fetch_nonIAEA_exp_data
88

99
# By default this should set the token to None if not found
1010
F4E_GITLAB_TOKEN = os.getenv("F4E_GITLAB_TOKEN")
@@ -71,11 +71,11 @@ def test_fetch_f4e_inputs(tmpdir):
7171
def test_fetch_f4e_exp_data(tmpdir):
7272
""" " Test that experimental data can be correctly fetched from the F4E GitLab."""
7373
exp_path = tmpdir.mkdir("exp")
74-
success = fetch_f4e_exp_data(exp_path)
74+
success = fetch_nonIAEA_exp_data(exp_path)
7575
assert success
7676
assert len(os.listdir(exp_path)) > 0
7777

7878
# test that there no problems when the folder is not empty
79-
success = fetch_f4e_exp_data(exp_path)
79+
success = fetch_nonIAEA_exp_data(exp_path)
8080
assert success
8181
assert len(os.listdir(exp_path)) > 0

0 commit comments

Comments
 (0)