Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed Bug Regarding Attribute Error in pytest.approx For Types Implicitly Convertible to Numpy Arrays #12232

Merged
merged 13 commits into from
Apr 23, 2024
Merged

Fixed Bug Regarding Attribute Error in pytest.approx For Types Implicitly Convertible to Numpy Arrays #12232

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c077526
added conversion of other_side to numpy array
poulami-sau Apr 22, 2024
485e8ef
added test case in testing/python/approx.py based on test case provid…
poulami-sau Apr 22, 2024
3989384
added test case in testing/python/approx.py based on test case provid…
poulami-sau Apr 22, 2024
bdd9522
added .travis.yml to test on travis ci
poulami-sau Apr 22, 2024
7290338
edited travis file
poulami-sau Apr 22, 2024
9fb207e
deleted travis file
poulami-sau Apr 22, 2024
b5ee309
test cases pass for pytest testing/python/approx.py
poulami-sau Apr 22, 2024
6fa6835
idk
poulami-sau Apr 22, 2024
f673c07
added print statement in test case
poulami-sau Apr 22, 2024
314ef04
removed print statement in test case
poulami-sau Apr 22, 2024
476d9d0
expanded the type annotation to include objects which may cast to a a…
poulami-sau Apr 22, 2024
eeb8c47
Merge branch 'main' into implicit_array_conversion_fix
poulami-sau Apr 22, 2024
4c8a3d3
Merge branch 'main' into implicit_array_conversion_fix
poulami-sau Apr 22, 2024
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
13 changes: 7 additions & 6 deletions src/_pytest/python_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def __repr__(self) -> str:
)
return f"approx({list_scalars!r})"

def _repr_compare(self, other_side: "ndarray") -> List[str]:
def _repr_compare(self, other_side: Union["ndarray", List[Any]]) -> List[str]:
import itertools
import math

Expand All @@ -164,12 +164,13 @@ def get_value_from_nested_list(
)

# convert other_side to numpy array to ensure shape attribute is available
other_side = _as_numpy_array(other_side)
other_side_as_array = _as_numpy_array(other_side)
assert other_side_as_array is not None

if np_array_shape != other_side.shape:
if np_array_shape != other_side_as_array.shape:
return [
"Impossible to compare arrays with different shapes.",
f"Shapes: {np_array_shape} and {other_side.shape}",
f"Shapes: {np_array_shape} and {other_side_as_array.shape}",
]

number_of_elements = self.expected.size
Expand All @@ -178,7 +179,7 @@ def get_value_from_nested_list(
different_ids = []
for index in itertools.product(*(range(i) for i in np_array_shape)):
approx_value = get_value_from_nested_list(approx_side_as_seq, index)
other_value = get_value_from_nested_list(other_side, index)
other_value = get_value_from_nested_list(other_side_as_array, index)
if approx_value != other_value:
abs_diff = abs(approx_value.expected - other_value)
max_abs_diff = max(max_abs_diff, abs_diff)
Expand All @@ -191,7 +192,7 @@ def get_value_from_nested_list(
message_data = [
(
str(index),
str(get_value_from_nested_list(other_side, index)),
str(get_value_from_nested_list(other_side_as_array, index)),
str(get_value_from_nested_list(approx_side_as_seq, index)),
)
for index in different_ids
Expand Down
Loading