Skip to content

Commit

Permalink
Merge branch 'main' into 357-warnings-raised-by-underlying-seaborn-an…
Browse files Browse the repository at this point in the history
…d-numpy-libraries
  • Loading branch information
Marsmaennchen221 authored Jul 13, 2023
2 parents 04e6fc5 + ada934c commit 9a0186e
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
Table({"col1": [1, 2, 1], "col2": [1, 2, 4], "col3": [0, -1, -2]}),
),
(
Table({}),
Table(),
Column("col3", []),
Table({"col3": []}),
),
(
Table({}),
Table(),
Column("col3", [1]),
Table({"col3": [1]}),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
Table({"col1": [1, 2, 1], "col2": [1, 2, 4], "col3": [0, -1, -2], "col4": ["a", "b", "c"]}),
),
(
Table({}),
Table(),
[Column("col3", []), Column("col4", [])],
Table({"col3": [], "col4": []}),
),
(
Table({}),
Table(),
[Column("col3", [1]), Column("col4", [2])],
Table({"col3": [1], "col4": [2]}),
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[
(
[],
Table({}),
Table(),
),
(
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
("table", "expected"),
[
(Table(), 0),
(Table({}), 0),
(Table(), 0),
(Table({"col1": []}), 1),
(Table({"col1": [], "col2": []}), 2),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
("table", "expected"),
[
(Table(), 0),
(Table({}), 0),
(Table(), 0),
(Table({"col1": [1]}), 1),
(Table({"col1": [1, 2]}), 2),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
),
)
),
(Table({}), Table({})),
(Table(), Table()),
],
ids=["some missing values", "empty"],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
),
),
(Table({}), Table({})),
(Table(), Table()),
],
ids=["numerical values", "empty"],
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
),
),
(Table({}), Table({})),
(Table(), Table()),
],
ids=["some missing values", "empty"],
)
Expand Down
6 changes: 3 additions & 3 deletions tests/safeds/data/tabular/containers/_table/test_repr_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@pytest.mark.parametrize(
"table",
[
Table({}),
Table(),
Table({"a": [1, 2], "b": [3, 4]}),
],
ids=[
Expand All @@ -23,7 +23,7 @@ def test_should_contain_table_element(table: Table) -> None:
@pytest.mark.parametrize(
"table",
[
Table({}),
Table(),
Table({"a": [1, 2], "b": [3, 4]}),
],
ids=[
Expand All @@ -39,7 +39,7 @@ def test_should_contain_th_element_for_each_column_name(table: Table) -> None:
@pytest.mark.parametrize(
"table",
[
Table({}),
Table(),
Table({"a": [1, 2], "b": [3, 4]}),
],
ids=[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
("table", "expected"),
[
(
Table({}),
Table(),
{},
),
(
Expand Down
6 changes: 3 additions & 3 deletions tests/safeds/data/tabular/containers/_table/test_to_html.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@pytest.mark.parametrize(
"table",
[
Table({}),
Table(),
Table({"a": [1, 2], "b": [3, 4]}),
],
ids=[
Expand All @@ -23,7 +23,7 @@ def test_should_contain_table_element(table: Table) -> None:
@pytest.mark.parametrize(
"table",
[
Table({}),
Table(),
Table({"a": [1, 2], "b": [3, 4]}),
],
ids=[
Expand All @@ -39,7 +39,7 @@ def test_should_contain_th_element_for_each_column_name(table: Table) -> None:
@pytest.mark.parametrize(
"table",
[
Table({}),
Table(),
Table({"a": [1, 2], "b": [3, 4]}),
],
ids=[
Expand Down
2 changes: 1 addition & 1 deletion tests/safeds/data/tabular/containers/test_row.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ def test_should_return_true_if_objects_are_identical(self, row: Row) -> None:
("row", "other"),
[
(Row({"col1": 0}), None),
(Row({"col1": 0}), Table({})),
(Row({"col1": 0}), Table()),
],
ids=[
"Row vs. None",
Expand Down

0 comments on commit 9a0186e

Please sign in to comment.