Merge branch 'main' into feature/eq-return-not-implemented

emilykl · web-flow · commit aa4fbac1c88b · 2026-04-14T13:14:45.000-04:00
diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - doc-prod
   pull_request:
+    types: [opened, reopened, synchronize]
 
 jobs:
   build-doc:
diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
@@ -2,8 +2,10 @@ name: Build
 
 on:
   push:
+    branches:
+      - main
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
 
 jobs:
   plotlyjs-dev-build:
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -2,8 +2,10 @@ name: Check Python code formatting
 
 on:
   push:
+    branches:
+      - main
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
 
 jobs:
   check-code-formatting:
diff --git a/.github/workflows/check-js-build.yml b/.github/workflows/check-js-build.yml
@@ -1,4 +1,13 @@
-on: push
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    types: [opened, reopened]
+    paths:
+      - 'js/**'
+      - 'plotly/labextension/**'
+
 name: Check JS build
 
 jobs:
diff --git a/.github/workflows/run-percy.yml b/.github/workflows/run-percy.yml
@@ -2,8 +2,10 @@ name: Run Percy
 
 on:
   push:
+    branches:
+      - main
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
   workflow_dispatch:
 
 jobs:
diff --git a/.github/workflows/run-pytest.yml b/.github/workflows/run-pytest.yml
@@ -2,8 +2,10 @@ name: Test
 
 on:
   push:
+    branches:
+      - main
   pull_request:
-    types: [opened, reopened]
+    types: [opened, reopened, synchronize]
 
 jobs:
   test-core:
@@ -54,7 +56,7 @@ jobs:
         run: |
           uv venv
           source .venv/bin/activate
-          uv sync --extra dev_optional
+          uv sync --extra dev_optional --extra dev_pandas3
           python --version
       - name: Test core
         run: |
@@ -82,14 +84,22 @@ jobs:
           python -m pytest -x test_init/test_lazy_imports.py
 
   test-optional-legacy-pandas:
-    name: Optional tests, Pandas 1 (Python 3.9, Pandas 1.2.4)
+    name: Optional tests (Python ${{ matrix.python-version }}, pandas ${{ matrix.pandas-version }})
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - python-version: "3.9"
+            pandas-version: "1"
+          - python-version: "3.11"
+            pandas-version: "2"
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
       - name: Set up Python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
         with:
-          python-version: "3.9"
+          python-version: ${{ matrix.python-version }}
       - name: Set up Chrome for browser tests
         uses: ./.github/actions/setup-chrome-for-pytest
       - name: Set up uv
@@ -98,8 +108,7 @@ jobs:
         run: |
           uv venv
           source .venv/bin/activate
-          uv sync --extra dev_optional
-          uv pip install pandas==1.2.4 numpy==1.26.4
+          uv sync --extra dev_optional --extra dev_pandas${{ matrix.pandas-version }}
       - name: Test core
         run: |
           source .venv/bin/activate
@@ -126,7 +135,7 @@ jobs:
           python -m pytest -x test_init/test_lazy_imports.py
 
   test-kaleido-v0:
-    name: Optional tests (Kaleido only), Kaleido v0 (Python 3.12, Kaleido v0.2.1)
+    name: Optional tests (Kaleido only), Kaleido v0 (Python 3.12, kaleido 0.2.1)
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd  # v6.0.2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,12 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## Unreleased
-- The `__eq__` method for  `graph_objects` classes now returns `NotImplemented` to give the other operand an opportunity to handle the comparison.
+
+### Fixed
+- Update tests to be compatible with numpy 2.4 [[#5522](https://github.com/plotly/plotly.py/pull/5522)], with thanks to @thunze for the contribution!
+
+### Updated
+- The `__eq__` method for  `graph_objects` classes now returns `NotImplemented` to give the other operand an opportunity to handle the comparison [[#5547](https://github.com/plotly/plotly.py/pull/5547)], with thanks to @RazerM for the contribution!
 
 ## [6.7.0] - 2026-04-09
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -83,8 +83,26 @@ dev = [
     "plotly[dev_optional]"
 ]
 
+# The following extras are intended for use in CI only
+dev_pandas1 = [
+    "pandas>=1,<2",
+    "numpy>=1,<2",
+    "setuptools<82"
+]
+dev_pandas2 = [
+    "pandas>=2,<3",
+]
+dev_pandas3 = [
+    "pandas>=3;python_version>='3.11'",
+]
+
 [tool.uv]
 exclude-newer = "72 hours"
+conflicts = [
+    [{ extra = "dev_pandas1" }, { extra = "dev_pandas2" }],
+    [{ extra = "dev_pandas1" }, { extra = "dev_pandas3" }],
+    [{ extra = "dev_pandas2" }, { extra = "dev_pandas3" }],
+]
 
 [project.scripts]
 plotly_get_chrome = "plotly.io._kaleido:plotly_get_chrome"
diff --git a/tests/test_optional/test_px/test_px.py b/tests/test_optional/test_px/test_px.py
@@ -36,7 +36,7 @@ def test_custom_data_scatter(backend):
     )
     for data in fig.data:
         assert np.all(
-            np.in1d(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())
+            np.isin(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())
         )
     # Hover and custom data, no repeated arguments
     fig = px.scatter(
diff --git a/tests/test_optional/test_px/test_px_functions.py b/tests/test_optional/test_px/test_px_functions.py
@@ -1,11 +1,19 @@
-import plotly.express as px
-import plotly.graph_objects as go
-from numpy.testing import assert_array_equal
 import narwhals.stable.v1 as nw
 import numpy as np
+from numpy.testing import assert_array_equal
+from packaging.version import Version
+import pandas
+import plotly.express as px
+import plotly.graph_objects as go
 from polars.exceptions import InvalidOperationError
 import pytest
 
+from .conftest import pandas_pyarrow_constructor
+
+
+def _pandas_version_at_least(version: str) -> bool:
+    return Version(pandas.__version__) >= Version(version)
+
 
 def _compare_figures(go_trace, px_fig):
     """Compare a figure created with a go trace and a figure created with
@@ -153,6 +161,11 @@ def test_sunburst_treemap_colorscales():
 
 
 def test_sunburst_treemap_with_path(constructor):
+    if _pandas_version_at_least("3.0.0") and constructor == pandas_pyarrow_constructor:
+        pytest.skip(
+            "known issue with pandas 3 + pandas_pyarrow_constructor + px.sunburst() (https://github.com/plotly/plotly.py/issues/5571)"
+        )
+
     vendors = ["A", "B", "C", "D", "E", "F", "G", "H"]
     sectors = [
         "Tech",
@@ -249,6 +262,11 @@ def test_sunburst_treemap_with_path_and_hover(backend):
 
 
 def test_sunburst_treemap_with_path_color(constructor):
+    if _pandas_version_at_least("3.0.0") and constructor == pandas_pyarrow_constructor:
+        pytest.skip(
+            "known issue with pandas 3 + pandas_pyarrow_constructor + px.sunburst() (https://github.com/plotly/plotly.py/issues/5571)"
+        )
+
     vendors = ["A", "B", "C", "D", "E", "F", "G", "H"]
     sectors = [
         "Tech",
@@ -307,7 +325,7 @@ def test_sunburst_treemap_with_path_color(constructor):
     fig = px.sunburst(
         df.to_native(), path=path, color="sectors", color_discrete_map=cmap
     )
-    assert np.all(np.in1d(fig.data[0].marker.colors, list(cmap.values())))
+    assert np.all(np.isin(fig.data[0].marker.colors, list(cmap.values())))
 
     # Numerical column in path
     df = (
@@ -327,6 +345,11 @@ def test_sunburst_treemap_with_path_color(constructor):
 
 
 def test_sunburst_treemap_column_parent(constructor):
+    if _pandas_version_at_least("3.0.0") and constructor == pandas_pyarrow_constructor:
+        pytest.skip(
+            "known issue with pandas 3 + pandas_pyarrow_constructor + px.sunburst() (https://github.com/plotly/plotly.py/issues/5571)"
+        )
+
     vendors = ["A", "B", "C", "D", "E", "F", "G", "H"]
     sectors = [
         "Tech",
@@ -354,6 +377,11 @@ def test_sunburst_treemap_column_parent(constructor):
 
 
 def test_sunburst_treemap_with_path_non_rectangular(constructor):
+    if _pandas_version_at_least("3.0.0") and constructor == pandas_pyarrow_constructor:
+        pytest.skip(
+            "known issue with pandas 3 + pandas_pyarrow_constructor + px.sunburst() (https://github.com/plotly/plotly.py/issues/5571)"
+        )
+
     vendors = ["A", "B", "C", "D", None, "E", "F", "G", "H", None]
     sectors = [
         "Tech",
diff --git a/tests/test_optional/test_utils/test_utils.py b/tests/test_optional/test_utils/test_utils.py
@@ -311,11 +311,24 @@ def test_encode_customdata_datetime_series(self):
         fig_json = _json.dumps(
             fig, cls=utils.PlotlyJSONEncoder, separators=(",", ":"), sort_keys=True
         )
-        self.assertTrue(
-            fig_json.startswith(
-                '{"data":[{"customdata":["2010-01-01T00:00:00.000000000","2010-01-02T00:00:00.000000000"]'
+
+        fig_from_json = Figure(_json.loads(fig_json))
+
+        import pandas
+
+        if Version(pandas.__version__) >= Version("3.0.0"):
+            # Starting in pandas 3, datetimes have ms precision by default
+            # https://pandas.pydata.org/docs/whatsnew/v3.0.0.html#datetime-timedelta-resolution-inference
+            assert fig_from_json.data[0].customdata == (
+                "2010-01-01T00:00:00.000000",
+                "2010-01-02T00:00:00.000000",
+            )
+        else:
+            # Before pandas 3, datetimes have ns precision by default
+            assert fig_from_json.data[0].customdata == (
+                "2010-01-01T00:00:00.000000000",
+                "2010-01-02T00:00:00.000000000",
             )
-        )
 
     def test_encode_customdata_datetime_homogeneous_dataframe(self):
         df = pd.DataFrame(
@@ -332,13 +345,24 @@ def test_encode_customdata_datetime_homogeneous_dataframe(self):
         fig_json = _json.dumps(
             fig, cls=utils.PlotlyJSONEncoder, separators=(",", ":"), sort_keys=True
         )
-        self.assertTrue(
-            fig_json.startswith(
-                '{"data":[{"customdata":'
-                '[["2010-01-01T00:00:00.000000000","2011-01-01T00:00:00.000000000"],'
-                '["2010-01-02T00:00:00.000000000","2011-01-02T00:00:00.000000000"]'
+
+        fig_from_json = Figure(_json.loads(fig_json))
+
+        import pandas
+
+        if Version(pandas.__version__) >= Version("3.0.0"):
+            # Starting in pandas 3, datetimes have ms precision by default
+            # https://pandas.pydata.org/docs/whatsnew/v3.0.0.html#datetime-timedelta-resolution-inference
+            assert fig_from_json.data[0].customdata == (
+                ["2010-01-01T00:00:00.000000", "2011-01-01T00:00:00.000000"],
+                ["2010-01-02T00:00:00.000000", "2011-01-02T00:00:00.000000"],
+            )
+        else:
+            # Before pandas 3, datetimes have ns precision by default
+            assert fig_from_json.data[0].customdata == (
+                ["2010-01-01T00:00:00.000000000", "2011-01-01T00:00:00.000000000"],
+                ["2010-01-02T00:00:00.000000000", "2011-01-02T00:00:00.000000000"],
             )
-        )
 
     def test_encode_customdata_datetime_inhomogeneous_dataframe(self):
         df = pd.DataFrame(
@@ -384,11 +408,26 @@ def test_datetime_dot_date(self):
     def test_numpy_datetime64(self):
         a = pd.date_range("2011-07-11", "2011-07-13", freq="D").values
         j1 = _json.dumps(a, cls=utils.PlotlyJSONEncoder)
-        assert (
-            j1 == '["2011-07-11T00:00:00.000000000", '
-            '"2011-07-12T00:00:00.000000000", '
-            '"2011-07-13T00:00:00.000000000"]'
-        )
+
+        from_json = _json.loads(j1)
+
+        import pandas
+
+        if Version(pandas.__version__) >= Version("3.0.0"):
+            # Starting in pandas 3, datetimes have ms precision by default
+            # https://pandas.pydata.org/docs/whatsnew/v3.0.0.html#datetime-timedelta-resolution-inference
+            assert from_json == [
+                "2011-07-11T00:00:00.000000",
+                "2011-07-12T00:00:00.000000",
+                "2011-07-13T00:00:00.000000",
+            ]
+        else:
+            # Before pandas 3, datetimes have ns precision by default
+            assert from_json == [
+                "2011-07-11T00:00:00.000000000",
+                "2011-07-12T00:00:00.000000000",
+                "2011-07-13T00:00:00.000000000",
+            ]
 
     def test_pil_image_encoding(self):
         img_path = os.path.join(
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ def test_custom_data_scatter(backend):`
`36`	`36`	`)`
`37`	`37`	`for data in fig.data:`
`38`	`38`	`assert np.all(`
`39`		`- np.in1d(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())`
	`39`	`+ np.isin(data.customdata[:, 1], iris.get_column("petal_width").to_numpy())`
`40`	`40`	`)`
`41`	`41`	`# Hover and custom data, no repeated arguments`
`42`	`42`	`fig = px.scatter(`