Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Jan 30, 2025
1 parent 35c423e commit ec34e45
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 11 deletions.
4 changes: 2 additions & 2 deletions src/roman_datamodels/datamodels/_datamodels.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def node_update(raw, other):
value = getattr(other, key).data
elif isinstance(raw[key], np.ndarray):
value = getattr(other, key).astype(raw[key].dtype)
value = getattr(value, 'value', value)
value = getattr(value, "value", value)
else:
value = getattr(other, key)
setattr(raw, key, value)
Expand Down Expand Up @@ -239,7 +239,7 @@ def node_update(ramp, other):
value = getattr(other, key).data
elif isinstance(ramp[key], np.ndarray):
value = getattr(other, key).astype(ramp[key].dtype)
value = getattr(value, 'value', value)
value = getattr(value, "value", value)
else:
value = getattr(other, key)
setattr(ramp, key, value)
Expand Down
26 changes: 17 additions & 9 deletions tests/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -932,11 +932,15 @@ def test_model_only_init_with_correct_node(node, correct, model):
model(img)


@pytest.mark.parametrize('mk_raw',
[lambda : datamodels.ScienceRawModel(utils.mk_level1_science_raw(shape=(2, 8, 8))),
lambda : datamodels.TvacModel(utils.mk_tvac(shape=(2, 8, 8))),
lambda : datamodels.FpsModel(utils.mk_fps(shape=(2, 8, 8))),
lambda : datamodels.RampModel(utils.mk_ramp(shape=(2, 8, 8)))])
@pytest.mark.parametrize(
"mk_raw",
[
lambda: datamodels.ScienceRawModel(utils.mk_level1_science_raw(shape=(2, 8, 8))),
lambda: datamodels.TvacModel(utils.mk_tvac(shape=(2, 8, 8))),
lambda: datamodels.FpsModel(utils.mk_fps(shape=(2, 8, 8))),
lambda: datamodels.RampModel(utils.mk_ramp(shape=(2, 8, 8))),
],
)
def test_ramp_from_science_raw(mk_raw):
raw = mk_raw()
ramp = datamodels.RampModel.from_science_raw(raw)
Expand Down Expand Up @@ -969,10 +973,14 @@ def test_ramp_from_science_raw(mk_raw):
raise ValueError(f"Unexpected type {type(ramp_value)}, {key}") # pragma: no cover


@pytest.mark.parametrize('mk_tvac',
[lambda : datamodels.ScienceRawModel(utils.mk_level1_science_raw(shape=(2, 8, 8))),
lambda : datamodels.TvacModel(utils.mk_tvac(shape=(2, 8, 8))),
lambda : datamodels.FpsModel(utils.mk_fps(shape=(2, 8, 8)))])
@pytest.mark.parametrize(
"mk_tvac",
[
lambda: datamodels.ScienceRawModel(utils.mk_level1_science_raw(shape=(2, 8, 8))),
lambda: datamodels.TvacModel(utils.mk_tvac(shape=(2, 8, 8))),
lambda: datamodels.FpsModel(utils.mk_fps(shape=(2, 8, 8))),
],
)
def test_science_raw_from_tvac_raw(mk_tvac):
tvac = mk_tvac()

Expand Down

0 comments on commit ec34e45

Please sign in to comment.