Merge branch 'main' into upgrade-kaleido

emilykl · emilykl · commit b9e5f7ad7309 · 2025-04-14T16:49:59.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# Change Log
+# Changelog
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
diff --git a/doc/python/3d-axes.md b/doc/python/3d-axes.md
@@ -6,7 +6,7 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.3'
-      jupytext_version: 1.15.1
+      jupytext_version: 1.16.4
   kernelspec:
     display_name: Python 3 (ipykernel)
     language: python
@@ -114,7 +114,7 @@ fig = make_subplots(rows=2, cols=2,
                     print_grid=False)
 for i in [1,2]:
     for j in [1,2]:
-        fig.append_trace(
+        fig.add_trace(
             go.Mesh3d(
                 x=(60*np.random.randn(N)),
                 y=(25*np.random.randn(N)),
diff --git a/doc/python/histograms.md b/doc/python/histograms.md
@@ -6,9 +6,9 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.3'
-      jupytext_version: 1.14.1
+      jupytext_version: 1.16.4
   kernelspec:
-    display_name: Python 3
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
   language_info:
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.8.8
+    version: 3.11.10
   plotly:
     description: How to make Histograms in Python with Plotly.
     display_as: statistical
@@ -438,12 +438,12 @@ trace5 = go.Histogram(x=x,
                       autobinx = False
                       )
 
-fig.append_trace(trace0, 1, 1)
-fig.append_trace(trace1, 1, 2)
-fig.append_trace(trace2, 2, 1)
-fig.append_trace(trace3, 2, 2)
-fig.append_trace(trace4, 3, 1)
-fig.append_trace(trace5, 3, 2)
+fig.add_trace(trace0, 1, 1)
+fig.add_trace(trace1, 1, 2)
+fig.add_trace(trace2, 2, 1)
+fig.add_trace(trace3, 2, 2)
+fig.add_trace(trace4, 3, 1)
+fig.add_trace(trace5, 3, 2)
 
 fig.show()
 ```
diff --git a/doc/python/horizontal-bar-charts.md b/doc/python/horizontal-bar-charts.md
@@ -5,10 +5,10 @@ jupyter:
     text_representation:
       extension: .md
       format_name: markdown
-      format_version: '1.1'
-      jupytext_version: 1.1.1
+      format_version: '1.3'
+      jupytext_version: 1.16.4
   kernelspec:
-    display_name: Python 3
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
   language_info:
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.6.7
+    version: 3.11.10
   plotly:
     description: How to make horizontal bar charts in Python with Plotly.
     display_as: basic
@@ -239,7 +239,7 @@ x = ['Japan', 'United Kingdom', 'Canada', 'Netherlands',
 fig = make_subplots(rows=1, cols=2, specs=[[{}, {}]], shared_xaxes=True,
                     shared_yaxes=False, vertical_spacing=0.001)
 
-fig.append_trace(go.Bar(
+fig.add_trace(go.Bar(
     x=y_saving,
     y=x,
     marker=dict(
@@ -252,7 +252,7 @@ fig.append_trace(go.Bar(
     orientation='h',
 ), 1, 1)
 
-fig.append_trace(go.Scatter(
+fig.add_trace(go.Scatter(
     x=y_net_worth, y=x,
     mode='lines+markers',
     line_color='rgb(128, 0, 128)',
@@ -335,4 +335,4 @@ fig.show()
 
 ### Reference
 
-See more examples of bar charts and styling options [here](https://plotly.com/python/bar-charts/).<br> See https://plotly.com/python/reference/bar/ for more information and chart attribute options!
+See more examples of bar charts and styling options [here](https://plotly.com/python/bar-charts/).<br> See https://plotly.com/python/reference/bar/ for more information and chart attribute options!
diff --git a/doc/python/subplots.md b/doc/python/subplots.md
@@ -6,9 +6,9 @@ jupyter:
       extension: .md
       format_name: markdown
       format_version: '1.3'
-      jupytext_version: 1.14.1
+      jupytext_version: 1.16.4
   kernelspec:
-    display_name: Python 3
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
   language_info:
@@ -20,7 +20,7 @@ jupyter:
     name: python
     nbconvert_exporter: python
     pygments_lexer: ipython3
-    version: 3.8.8
+    version: 3.11.10
   plotly:
     description: How to make subplots in with Plotly's Python graphing library. Examples
       of stacked, custom-sized, gridded, and annotated subplots.
@@ -80,17 +80,17 @@ import plotly.graph_objects as go
 
 fig = make_subplots(rows=3, cols=1)
 
-fig.append_trace(go.Scatter(
+fig.add_trace(go.Scatter(
     x=[3, 4, 5],
     y=[1000, 1100, 1200],
 ), row=1, col=1)
 
-fig.append_trace(go.Scatter(
+fig.add_trace(go.Scatter(
     x=[2, 3, 4],
     y=[100, 110, 120],
 ), row=2, col=1)
 
-fig.append_trace(go.Scatter(
+fig.add_trace(go.Scatter(
     x=[0, 1, 2],
     y=[10, 11, 12]
 ), row=3, col=1)
diff --git a/plotly/io/_html.py b/plotly/io/_html.py
@@ -471,8 +471,7 @@ def write_html(
 
     Returns
     -------
-    str
-        Representation of figure as an HTML div string
+    None
     """
 
     # Build HTML string
diff --git a/plotly/io/_renderers.py b/plotly/io/_renderers.py
@@ -400,8 +400,8 @@ def show(fig, renderer=None, validate=True, **kwargs):
         plot is. The default is set in plotly.js.
 
     height: int or float
-        An integer or float that determines the number of pixels wide the
-        plot is. The default is set in plotly.js.
+        An integer or float specifying the height of the plot in pixels.
+        The default is set in plotly.js.
 
     config: dict
         A dict of parameters to configure the figure. The defaults are set
diff --git a/plotly/subplots.py b/plotly/subplots.py
@@ -59,8 +59,8 @@ def make_subplots(
           - 'bottom-left': Subplots are numbererd with (1, 1) in the bottom
                            left corner
 
-    print_grid: boolean (default True):
-        If True, prints a string representation of the plot grid.  Grid may
+    print_grid: boolean (default False):
+        If True, prints a string representation of the plot grid. Grid may
         also be printed using the `Figure.print_grid()` method on the
         resulting figure.
 
@@ -218,7 +218,7 @@ def make_subplots(
     >>> fig.add_scatter(y=[1, 3, 2], row=2, col=1) # doctest: +ELLIPSIS
     Figure(...)
 
-    or see Figure.append_trace
+    or see Figure.add_trace
 
     Example 2:
 
diff --git a/plotly/tools.py b/plotly/tools.py
@@ -249,7 +249,7 @@ def make_subplots(
     fig['data'] += [Scatter(x=[1,2,3], y=[2,1,2])]
     fig['data'] += [Scatter(x=[1,2,3], y=[2,1,2], xaxis='x2', yaxis='y2')]
 
-    # or see Figure.append_trace
+    # or see Figure.add_trace
 
     Example 2:
     # subplots with shared x axes
diff --git a/tests/test_optional/test_figure_factory/test_figure_factory.py b/tests/test_optional/test_figure_factory/test_figure_factory.py
@@ -4108,66 +4108,6 @@ def test_scope_is_not_list(self):
                 scope="foo",
             )
 
-        def test_full_choropleth(self):
-            fips = [1001]
-            values = [1]
-            fig = ff.create_choropleth(fips=fips, values=values, simplify_county=1)
-
-            exp_fig_head = (
-                -88.053375,
-                -88.02916499999999,
-                -88.02432999999999,
-                -88.04504299999999,
-                -88.053375,
-                np_nan(),
-                -88.211209,
-                -88.209999,
-                -88.208733,
-                -88.209559,
-                -88.211209,
-                np_nan(),
-                -88.22511999999999,
-                -88.22128099999999,
-                -88.218694,
-                -88.22465299999999,
-                -88.22511999999999,
-                np_nan(),
-                -88.264659,
-                -88.25782699999999,
-                -88.25947,
-                -88.255659,
-                -88.264659,
-                np_nan(),
-                -88.327302,
-                -88.20146799999999,
-                -88.141143,
-                -88.124658,
-                -88.074854,
-                -88.12493599999999,
-                -88.10665399999999,
-                -88.149812,
-                -88.327302,
-                np_nan(),
-                -88.346745,
-                -88.341235,
-                -88.33288999999999,
-                -88.346823,
-                -88.346745,
-                np_nan(),
-                -88.473227,
-                -88.097888,
-                -88.154617,
-                -88.20295899999999,
-                -85.605165,
-                -85.18440000000001,
-                -85.12218899999999,
-                -85.142567,
-                -85.113329,
-                -85.10533699999999,
-            )
-
-            self.assertEqual(fig["data"][2]["x"][:50], exp_fig_head)
-
 
 class TestQuiver(TestCaseNoTemplate):
     def test_scaleratio_param(self):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Change Log`
	`1`	`+# Changelog`
`2`	`2`	`All notable changes to this project will be documented in this file.`
`3`	`3`	`This project adheres to [Semantic Versioning](http://semver.org/).`
`4`	`4`