这是indexloc提供的服务，不要输入任何密码
Skip to content

Simplify assert_frame_equal_with_sort #113

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

Merged
merged 1 commit into from
Nov 4, 2025
Merged

Simplify assert_frame_equal_with_sort #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions test/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,6 @@ def assert_frame_equal_with_sort(
first_df: pd.DataFrame,
second_df: pd.DataFrame,
sort_columns: Optional[Sequence[str]] = None,
**kwargs: Any,
):
"""Asserts that the two Pandas DataFrames are equal.

Expand All @@ -240,7 +239,6 @@ def assert_frame_equal_with_sort(
first_df: First dataframe to compare.
second_df: Second dataframe to compare.
sort_columns: Names of column to sort on. By default sorts by all columns.
**kwargs: Keyword arguments that will be passed to assert_frame_equal().
"""
if sorted(first_df.columns) != sorted(second_df.columns):
raise ValueError(
Expand All @@ -258,7 +256,7 @@ def assert_frame_equal_with_sort(
# We explicitly pass check_dtype=False the equality check, so that identical
# DataFrames which differ only in dtypes (like one with an int64 column and
# the other with an Int64 column) are considered equal.
pd.testing.assert_frame_equal(first_df, second_df, check_dtype=False, **kwargs)
pd.testing.assert_frame_equal(first_df, second_df, check_dtype=False)


def create_mock_measurement(
Expand Down
4 changes: 2 additions & 2 deletions test/system/session/rows/test_add_max_rows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def test_create_view_with_stability(
f=lambda row: [{}, {}],
new_column_types={},
augment=True,
max_rows=1,
max_rows=2,
)
session.create_view(transformation_query, "flatmap_transformation", cache=False)

Expand All @@ -644,7 +644,7 @@ def test_create_view_with_stability(
.sum("X", 0, 3, name="sum")
)
actual = session.evaluate(sum_query, privacy_budget)
assert_frame_equal_with_sort(actual.toPandas(), expected, rtol=1)
assert_frame_equal_with_sort(actual.toPandas(), expected)

@pytest.mark.parametrize(
"starting_budget,partition_budget",
Expand Down