Skip to content

Commit

Permalink
[BUG] [CI] Fix merge conflict due to out-of-date base. (#1066)
Browse files Browse the repository at this point in the history
This PR fixes a failing test due to a PR being merged with an
out-of-date base.
  • Loading branch information
clarkzinzow authored Jun 20, 2023
1 parent defb630 commit 64ab8ce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/series/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,11 @@ def test_fixed_shape_image_round_trip():
from_arrow = Series.from_arrow(t.to_arrow())

assert from_arrow.datatype() == t.datatype()
assert from_arrow.to_pylist() == t.to_pylist()
np.testing.assert_equal(from_arrow.to_pylist(), t.to_pylist())

t_copy = copy.deepcopy(t)
assert t_copy.datatype() == t.datatype()
assert t_copy.to_pylist() == t.to_pylist()
np.testing.assert_equal(t_copy.to_pylist(), t.to_pylist())


@pytest.mark.parametrize(
Expand Down

0 comments on commit 64ab8ce

Please sign in to comment.