Merge branch 'master' into LiamConnors-patch-1

Author: LiamConnors

.circleci/config.yml

@@ -52,3 +52,6 @@ doc/check-or-enforce-order.py
 packages/javascript/jupyterlab-plotly/lib/
 packages/python/plotly/jupyterlab_plotly/labextension/
 packages/python/plotly/jupyterlab_plotly/nbextension/index.js*
+
+test/percy/*.html
+test/percy/pandas2/*.html

.gitignore

@@ -2,6 +2,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [UNRELEASED]
+
+### Fixed
+  - Fixed another compatibility issue with Pandas 2.0, just affecting `px.*(line_close=True)` [[#4190](https://github.com/plotly/plotly.py/pull/4190)]
+  - Added some rounding to the `make_subplots` function to handle situations where the user-input specs cause the domain to exceed 1 by small amounts https://github.com/plotly/plotly.py/pull/4153
+
 ## [5.14.1] - 2023-04-05
 
 ### Fixed

CHANGELOG.md

@@ -109,42 +109,42 @@ If you are running this notebook live, click to [open the output directory](./im
 
 plotly.py can output figures to several raster image formats including **PNG**, ...
 
-```python
+~~~python
 fig.write_image("images/fig1.png")
-```
+~~~
 
 **JPEG**, ...
 
-```python
+~~~python
 fig.write_image("images/fig1.jpeg")
-```
+~~~
 
 and **WebP**
 
-```python
+~~~python
 fig.write_image("images/fig1.webp")
-```
+~~~
 
 #### Vector Formats: SVG and PDF...
 
 
 plotly.py can also output figures in several vector formats including **SVG**, ...
 
-```python
+~~~python
 fig.write_image("images/fig1.svg")
-```
+~~~
 
 **PDF**, ...
 
-```python
+~~~python
 fig.write_image("images/fig1.pdf")
-```
+~~~
 
 and **EPS** (requires the poppler library)
 
-```python
+~~~python
 fig.write_image("images/fig1.eps")
-```
+~~~
 
 **Note:** It is important to note that any figures containing WebGL traces (i.e. of type `scattergl`, `heatmapgl`, `contourgl`, `scatter3d`, `surface`, `mesh3d`, `scatterpolargl`, `cone`, `streamtube`, `splom`, or `parcoords`) that are exported in a vector format will include encapsulated rasters, instead of vectors, for some parts of the image.
 
@@ -199,14 +199,14 @@ Image(img_bytes)
 If `kaleido` is installed, it will automatically be used to perform image export.  If it is not installed, plotly.py will attempt to use `orca` instead. The `engine` argument to the `to_image` and `write_image` functions can be used to override this default behavior.
 
 Here is an example of specifying that orca should be used:
-```python
+~~~python
 fig.to_image(format="png", engine="orca")
-```
+~~~
 
 And, here is an example of specifying that Kaleido should be used:
-```python
+~~~python
 fig.to_image(format="png", engine="kaleido")
-```
+~~~
 
 <!-- #endregion -->
 

doc/python/static-image-export.md

@@ -671,7 +671,6 @@ def _check_hv_spacing(dimsize, spacing, name, dimvarname, dimname):
     # Loop through specs -- (r, c) <-> (row, col)
     for r, spec_row in enumerate(specs):
         for c, spec in enumerate(spec_row):
-
             if spec is None:  # skip over None cells
                 continue
 
@@ -702,6 +701,46 @@ def _check_hv_spacing(dimsize, spacing, name, dimvarname, dimname):
             else:
                 y_s = grid[r_spanned][c][1] + spec["b"]
                 y_e = grid[r][c][1] + heights[-1 - r] - spec["t"]
+
+            if y_s < 0.0:
+                # round for values very close to one
+                # handles some floating point errors
+                if y_s > -0.01:
+                    y_s = 0.0
+                else:
+                    raise Exception(
+                        "A combination of the 'b' values, heights, and "
+                        "number of subplots too large for this subplot grid."
+                    )
+            if y_s > 1.0:
+                # round for values very close to one
+                # handles some floating point errors
+                if y_s < 1.01:
+                    y_s = 1.0
+                else:
+                    raise Exception(
+                        "A combination of the 'b' values, heights, and "
+                        "number of subplots too large for this subplot grid."
+                    )
+
+            if y_e < 0.0:
+                if y_e > -0.01:
+                    y_e = 0.0
+                else:
+                    raise Exception(
+                        "A combination of the 't' values, heights, and "
+                        "number of subplots too large for this subplot grid."
+                    )
+
+            if y_e > 1.0:
+                if y_e < 1.01:
+                    y_e = 1.0
+                else:
+                    raise Exception(
+                        "A combination of the 't' values, heights, and "
+                        "number of subplots too large for this subplot grid."
+                    )
+
             y_domain = [y_s, y_e]
 
             list_of_domains.append(x_domain)
@@ -726,7 +765,6 @@ def _check_hv_spacing(dimsize, spacing, name, dimvarname, dimname):
     insets_ref = [None for inset in range(len(insets))] if insets else None
     if insets:
         for i_inset, inset in enumerate(insets):
-
             r = inset["cell"][0] - 1
             c = inset["cell"][1] - 1
 
@@ -1052,7 +1090,6 @@ def _subplot_type_for_trace_type(trace_type):
 
 
 def _validate_coerce_subplot_type(subplot_type):
-
     # Lowercase subplot_type
     orig_subplot_type = subplot_type
     subplot_type = subplot_type.lower()
@@ -1200,7 +1237,6 @@ def _build_subplot_title_annotations(
 
 
 def _build_grid_str(specs, grid_ref, insets, insets_ref, row_seq):
-
     # Compute rows and columns
     rows = len(specs)
     cols = len(specs[0])
@@ -1257,7 +1293,6 @@ def _pad(s, cell_len=cell_len):
     # Loop through specs, fill in _tmp
     for r, spec_row in enumerate(specs):
         for c, spec in enumerate(spec_row):
-
             ref = grid_ref[r][c]
             if ref is None:
                 if _tmp[r][c] == "":
@@ -1339,7 +1374,6 @@ def _pad(s, cell_len=cell_len):
 
 
 def _set_trace_grid_reference(trace, layout, grid_ref, row, col, secondary_y=False):
-
     if row <= 0:
         raise Exception(
             "Row value is out of range. " "Note: the starting cell is (1, 1)"
@@ -1461,7 +1495,6 @@ def _get_grid_subplot(fig, row, col, secondary_y=False):
 
 
 def _get_subplot_ref_for_trace(trace):
-
     if "domain" in trace:
         return SubplotRef(
             subplot_type="domain",

packages/python/plotly/plotly/_subplots.py

@@ -268,7 +268,7 @@ def make_trace_kwargs(args, trace_spec, trace_data, mapping_labels, sizeref):
         fit information to be used for trendlines
     """
     if "line_close" in args and args["line_close"]:
-        trace_data = trace_data.append(trace_data.iloc[0])
+        trace_data = pd.concat([trace_data, trace_data.iloc[:1]])
     trace_patch = trace_spec.trace_patch.copy() or {}
     fit_results = None
     hover_header = ""

packages/python/plotly/plotly/express/_core.py

@@ -23,8 +23,18 @@ def open_axes(self, ax, props):
             dict(type="y", scale="y", ticks=10),
         ]
         self.scales = [
-            dict(name="x", domain=props["xlim"], type="linear", range="width",),
-            dict(name="y", domain=props["ylim"], type="linear", range="height",),
+            dict(
+                name="x",
+                domain=props["xlim"],
+                type="linear",
+                range="width",
+            ),
+            dict(
+                name="y",
+                domain=props["ylim"],
+                type="linear",
+                range="height",
+            ),
         ]
 
     def draw_line(self, data, coordinates, style, label, mplobj=None):
@@ -103,7 +113,7 @@ def __init__(self, renderer):
 
     def html(self):
         """Build the HTML representation for IPython."""
-        id = random.randint(0, 2 ** 16)
+        id = random.randint(0, 2**16)
         html = '<div id="vis%d"></div>' % id
         html += "<script>\n"
         html += VEGA_TEMPLATE % (json.dumps(self.specification), id)

packages/python/plotly/plotly/matplotlylib/mplexporter/renderers/vega_renderer.py

@@ -146,8 +146,8 @@ def test_path():
 
 
 def test_Figure():
-    """ if the fig is not associated with a canvas, FakeRenderer shall
-    not fail. """
+    """if the fig is not associated with a canvas, FakeRenderer shall
+    not fail."""
     fig = plt.Figure()
     ax = fig.add_subplot(111)
     ax.add_patch(plt.Circle((0, 0), 1))

packages/python/plotly/plotly/matplotlylib/mplexporter/tests/test_basic.py

@@ -660,6 +660,22 @@ def test_specs_padding(self):
         )
         self.assertEqual(fig.to_plotly_json(), expected.to_plotly_json())
 
+    def test_specs_rounding_rounds_down(self):
+        n_subplots = 8
+        padding_size = 0.2
+
+        specs = []
+        for _ in range(n_subplots):
+            specs.append([{"b": padding_size / 2.0, "t": padding_size / 2.0}])
+
+        fig = subplots.make_subplots(rows=n_subplots, specs=specs)
+        self.assertTrue(
+            all(
+                fig.layout[f"yaxis{i if i > 1 else ''}"]["domain"][0] <= 1.0
+                for i in range(1, n_subplots + 1)
+            )
+        )
+
     def test_specs_padding_bottom_left(self):
         expected = Figure(
             data=Data(),
@@ -1592,7 +1608,6 @@ def test_large_columns_no_errors(self):
         )
 
     def test_row_width_and_column_width(self):
-
         expected = Figure(
             {
                 "data": [],
@@ -1680,7 +1695,6 @@ def test_row_width_and_column_width(self):
         self.assertEqual(fig.to_plotly_json(), expected.to_plotly_json())
 
     def test_row_width_and_shared_yaxes(self):
-
         expected = Figure(
             {
                 "data": [],