Merge branch 'master' into better-pandas-warning

emilykl · emilykl · commit 1607ccfeb42a · 2024-11-22T11:40:08.000-05:00
diff --git a/packages/python/plotly/plotly/express/_core.py b/packages/python/plotly/plotly/express/_core.py
@@ -1486,9 +1486,8 @@ def build_dataframe(args, constructor):
     # PySpark to pandas.
     is_pd_like = False
 
-    # Flag that indicates if data_frame requires to be converted to arrow via the
-    # dataframe interchange protocol.
-    # True if Ibis, DuckDB, Vaex or implements __dataframe__
+    # Flag that indicates if data_frame needs to be converted to PyArrow.
+    # True if Ibis, DuckDB, Vaex, or implements __dataframe__
     needs_interchanging = False
 
     # If data_frame is provided, we parse it into a narwhals DataFrame, while accounting
diff --git a/packages/python/plotly/plotly/tests/test_optional/test_utils/test_utils.py b/packages/python/plotly/plotly/tests/test_optional/test_utils/test_utils.py
@@ -95,7 +95,7 @@ def np_inf():
     columns=["col 1"], data=[1, 2, 3, dt(2014, 1, 5), pd.NaT, np_nan(), np_inf()]
 )
 
-rng = pd.date_range("1/1/2011", periods=2, freq="H")
+rng = pd.date_range("1/1/2011", periods=2, freq="h")
 ts = pd.Series([1.5, 2.5], index=rng)
 
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ def np_inf():`
`95`	`95`	`columns=["col 1"], data=[1, 2, 3, dt(2014, 1, 5), pd.NaT, np_nan(), np_inf()]`
`96`	`96`	`)`
`97`	`97`
`98`		`-rng = pd.date_range("1/1/2011", periods=2, freq="H")`
	`98`	`+rng = pd.date_range("1/1/2011", periods=2, freq="h")`
`99`	`99`	`ts = pd.Series([1.5, 2.5], index=rng)`
`100`	`100`
`101`	`101`