Merge branch 'master' into update-plotlyjs-docs

LiamConnors · web-flow · commit 981bef48603c · 2023-05-05T11:25:01.000-04:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 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)]
+
 ## [5.14.1] - 2023-04-05
 
 ### Fixed
diff --git a/doc/python/static-image-export.md b/doc/python/static-image-export.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 -->
 
diff --git a/packages/python/plotly/plotly/express/_core.py b/packages/python/plotly/plotly/express/_core.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 = ""
diff --git a/packages/python/plotly/plotly/matplotlylib/mplexporter/renderers/vega_renderer.py b/packages/python/plotly/plotly/matplotlylib/mplexporter/renderers/vega_renderer.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)
diff --git a/packages/python/plotly/plotly/matplotlylib/mplexporter/tests/test_basic.py b/packages/python/plotly/plotly/matplotlylib/mplexporter/tests/test_basic.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))
diff --git a/packages/python/plotly/plotly/tests/test_orca/images/linux/fig1.eps b/packages/python/plotly/plotly/tests/test_orca/images/linux/fig1.eps
diff --git a/packages/python/plotly/plotly/tests/test_orca/images/linux/latexfig.eps b/packages/python/plotly/plotly/tests/test_orca/images/linux/latexfig.eps
@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%Produced by poppler pdftops version: 0.71.0 (http://poppler.freedesktop.org)
+%Produced by poppler pdftops version: 22.02.0 (http://poppler.freedesktop.org)
 %%Creator: Chromium
 %%LanguageLevel: 2
 %%DocumentSuppliedResources: (atend)
diff --git a/packages/python/plotly/plotly/tests/test_orca/images/linux/topofig.eps b/packages/python/plotly/plotly/tests/test_orca/images/linux/topofig.eps
@@ -1,5 +1,5 @@
 %!PS-Adobe-3.0 EPSF-3.0
-%Produced by poppler pdftops version: 0.71.0 (http://poppler.freedesktop.org)
+%Produced by poppler pdftops version: 22.02.0 (http://poppler.freedesktop.org)
 %%Creator: Chromium
 %%LanguageLevel: 2
 %%DocumentSuppliedResources: (atend)
diff --git a/packages/python/plotly/recipe/meta.yaml b/packages/python/plotly/recipe/meta.yaml
@@ -21,7 +21,7 @@ requirements:
     - python
     - pip
     - jupyterlab =3
-    - nodejs
+    - nodejs =16
     - setuptools
   run:
     - python
diff --git a/packages/python/plotly/test_requirements/requirements_36_core.txt b/packages/python/plotly/test_requirements/requirements_36_core.txt
@@ -1,3 +1,4 @@
 requests==2.12.4
 tenacity==6.2.0
 pytest==3.5.1
+packaging
diff --git a/packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt b/packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt
@@ -1,6 +1,6 @@
 requests==2.25.1
 tenacity==6.2.0
-pandas==2.0.0
+pandas==2.0.1
 numpy==1.20.3
 xarray==0.17.0
 statsmodels
diff --git a/test/percy/compare-pandas.py b/test/percy/compare-pandas.py
@@ -0,0 +1,29 @@
+import difflib
+import json
+import os
+
+os.chdir(os.path.dirname(__file__))
+
+
+def clean_float(numstr):
+    # round numbers to 3 digits, to remove floating-point differences
+    return round(float(numstr), 3)
+
+
+def get_fig(html):
+    # strip off all the rest of the html and js
+    fig_str = html[html.index("[{", html.rindex("Plotly.newPlot(")) :]
+    fig_str = fig_str[: fig_str.index("}    ") + 1]
+    data, layout, config = json.loads(f"[{fig_str}]", parse_float=clean_float)
+    fig_dict = dict(data=data, layout=layout, config=config)
+    return json.dumps(fig_dict, indent=2).splitlines(keepends=True)
+
+
+for filename in os.listdir("pandas2"):
+    with open(filename, encoding="utf-8") as f1:
+        with open(os.path.join("pandas2", filename)) as f2:
+            fig1 = get_fig(f1.read())
+            fig2 = get_fig(f2.read())
+            if any(l1 != l2 for l1, l2 in zip(fig1, fig2)):
+                print("".join(difflib.unified_diff(fig1, fig2)))
+                raise ValueError(f"Pandas 1/2 difference in {filename}")
diff --git a/test/percy/snapshots.yml b/test/percy/snapshots.yml
@@ -0,0 +1,22 @@
+version: 2
+static:
+  options:
+    waitForTimeout: 6000
+    execute:
+      beforeSnapshot: |
+        const stash = window._canvasStash = [];
+        Array.from(document.querySelectorAll('canvas')).forEach(c => {
+            const i = document.createElement('img');
+            i.src = c.toDataURL();
+            i.width = c.width;
+            i.height = c.height;
+            i.setAttribute('style', c.getAttribute('style'));
+            i.className = c.className;
+            i.setAttribute('data-canvasnum', stash.length);
+            stash.push(c);
+            c.parentElement.insertBefore(i, c);
+            c.parentElement.removeChild(c);
+        });
+snapshot:
+  widths:
+    - 1280
