Skip to content

Commit

Permalink
fix io.py shadow
Browse files Browse the repository at this point in the history
  • Loading branch information
tjlane committed Jan 26, 2025
1 parent 310ccd7 commit 7700f2e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion meteor/scripts/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
compute_kweighted_difference_map,
max_negentropy_kweighted_difference_map,
)
from meteor.io import find_observed_amplitude_column, find_observed_uncertainty_column
from meteor.mtzio import find_observed_amplitude_column, find_observed_uncertainty_column
from meteor.rsmap import Map
from meteor.scale import scale_maps
from meteor.settings import COMPUTED_MAP_RESOLUTION_LIMIT, KWEIGHT_PARAMETER_DEFAULT
Expand Down
26 changes: 13 additions & 13 deletions test/unit/test_io.py → test/unit/test_mtzio.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest

from meteor import io
from meteor import mtzio

FIND_column_FUNC_TYPE = Callable[[list[str]], str]

Expand Down Expand Up @@ -62,44 +62,44 @@

def test_infer_mtz_column() -> None:
to_search = ["FOO", "BAR", "BAZ"]
assert io._infer_mtz_column(to_search, ["FOO"]) == "FOO"
assert io._infer_mtz_column(to_search, ["BAR"]) == "BAR"
with pytest.raises(io.AmbiguousMtzColumnError):
_ = io._infer_mtz_column(to_search, [])
with pytest.raises(io.AmbiguousMtzColumnError):
_ = io._infer_mtz_column(to_search, ["FOO", "BAR"])
assert mtzio._infer_mtz_column(to_search, ["FOO"]) == "FOO"
assert mtzio._infer_mtz_column(to_search, ["BAR"]) == "BAR"
with pytest.raises(mtzio.AmbiguousMtzColumnError):
_ = mtzio._infer_mtz_column(to_search, [])
with pytest.raises(mtzio.AmbiguousMtzColumnError):
_ = mtzio._infer_mtz_column(to_search, ["FOO", "BAR"])


def validate_find_column_result(
function: FIND_column_FUNC_TYPE, columns: list[str], expected_result: str
) -> None:
if expected_result == "raise":
with pytest.raises(io.AmbiguousMtzColumnError):
with pytest.raises(mtzio.AmbiguousMtzColumnError):
_ = function(columns)
else:
assert function(columns) == expected_result


@pytest.mark.parametrize(("columns", "expected_result"), OBSERVED_INTENSITY_CASES)
def test_find_observed_intensity_column(columns: list[str], expected_result: str) -> None:
validate_find_column_result(io.find_observed_intensity_column, columns, expected_result)
validate_find_column_result(mtzio.find_observed_intensity_column, columns, expected_result)


@pytest.mark.parametrize(("columns", "expected_result"), OBSERVED_AMPLITUDE_CASES)
def test_find_observed_amplitude_column(columns: list[str], expected_result: str) -> None:
validate_find_column_result(io.find_observed_amplitude_column, columns, expected_result)
validate_find_column_result(mtzio.find_observed_amplitude_column, columns, expected_result)


@pytest.mark.parametrize(("columns", "expected_result"), OBSERVED_UNCERTAINTY_CASES)
def test_find_observed_uncertainty_column(columns: list[str], expected_result: str) -> None:
validate_find_column_result(io.find_observed_uncertainty_column, columns, expected_result)
validate_find_column_result(mtzio.find_observed_uncertainty_column, columns, expected_result)


@pytest.mark.parametrize(("columns", "expected_result"), COMPUTED_AMPLITUDE_CASES)
def test_find_computed_amplitude_column(columns: list[str], expected_result: str) -> None:
validate_find_column_result(io.find_computed_amplitude_column, columns, expected_result)
validate_find_column_result(mtzio.find_computed_amplitude_column, columns, expected_result)


@pytest.mark.parametrize(("columns", "expected_result"), COMPUTED_PHASE_CASES)
def test_find_computed_phase_column(columns: list[str], expected_result: str) -> None:
validate_find_column_result(io.find_computed_phase_column, columns, expected_result)
validate_find_column_result(mtzio.find_computed_phase_column, columns, expected_result)

0 comments on commit 7700f2e

Please sign in to comment.