Commit 9aa93e3

committed

Simplify code, add test for a hover_data dictionary

1 parent a457f0e commit 9aa93e3Copy full SHA for 9aa93e3

File tree

-6

lines changed

packages/python/plotly/plotly
- express
  - _core.py
- tests/test_optional/test_px
  - test_px_input.py

-6

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1423,13 +1423,11 @@ def build_dataframe(args, constructor):`
`1423`	`1423`	`i for i in args.values() if isinstance(i, str) and i in columns`
`1424`	`1424`	`]`
`1425`	`1425`	`for field in args:`
`1426`		`- if field in array_attrables and isinstance(`
`1427`		`- args[field], (list, dict)`
`1428`		`- ):`
	`1426`	`+ if args[field] is not None and field in array_attrables:`
`1429`	`1427`	`necessary_columns.extend(`
`1430`	`1428`	`[i for i in args[field] if i in columns]`
`1431`	`1429`	`)`
`1432`		`- columns = list(dict.fromkeys(necessary_columns))`
	`1430`	`+ columns = list(set(necessary_columns))`
`1433`	`1431`	`args["data_frame"] = pd.api.interchange.from_dataframe(`
`1434`	`1432`	`args["data_frame"].select_columns_by_name(columns)`
`1435`	`1433`	`)`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,10 @@ def test_build_df_from_vaex_and_polars(test_lib):`
`332`	`332`	`reason="plotly doesn't use a dataframe interchange protocol for pandas < 2.0.2",`
`333`	`333`	`)`
`334`	`334`	`@pytest.mark.parametrize("test_lib", ["vaex", "polars"])`
`335`		`-def test_build_df_with_hover_data_from_vaex_and_polars(test_lib):`
	`335`	`+@pytest.mark.parametrize(`
	`336`	`+ "hover_data", [["sepal_width"], {"sepal_length": False, "sepal_width": ":.2f"}]`
	`337`	`+)`
	`338`	`+def test_build_df_with_hover_data_from_vaex_and_polars(test_lib, hover_data):`
`336`	`339`	`if test_lib == "vaex":`
`337`	`340`	`import vaex as lib`
`338`	`341`	`else:`
`@@ -345,7 +348,7 @@ def test_build_df_with_hover_data_from_vaex_and_polars(test_lib):`
`345`	`348`	`data_frame=iris_vaex,`
`346`	`349`	`x="petal_width",`
`347`	`350`	`y="sepal_length",`
`348`		`- hover_data=["sepal_width"],`
	`351`	`+ hover_data=hover_data,`
`349`	`352`	`)`
`350`	`353`	`out = build_dataframe(args, go.Scatter)`
`351`	`354`	`assert_frame_equal(`

Comments

(0)