Merge branch 'master' into string-for-hover-data

Author: nicolaskruchten

Diff for: CHANGELOG.md

@@ -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/).
 
+## [5.13.1] - 2023-02-24
+
+### Updated
+  - Updated Plotly.js to from version 2.18.0 to version 2.18.2. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#2182----2023-02-15) for more information. These changes are reflected in the auto-generated `plotly.graph_objects` module.
+  - Updated distutils.Version to packaging.Version [#3897](https://github.com/plotly/plotly.py/pull/3897)] and [#4055](https://github.com/plotly/plotly.py/pull/4055)]
+
 ## [5.13.0] - 2023-01-23
 
 ### Updated

Diff for: README.md

@@ -33,7 +33,7 @@
 
 ## Quickstart
 
-`pip install plotly==5.13.0`
+`pip install plotly==5.13.1`
 
 Inside [Jupyter](https://jupyter.org/install) (installable with `pip install "jupyterlab>=3" "ipywidgets>=7.6"`):
 
@@ -78,13 +78,13 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
 plotly.py may be installed using pip...
 
 ```
-pip install plotly==5.13.0
+pip install plotly==5.13.1
 ```
 
 or conda.
 
 ```
-conda install -c plotly plotly=5.13.0
+conda install -c plotly plotly=5.13.1
 ```
 
 ### JupyterLab Support
@@ -106,7 +106,7 @@ The instructions above apply to JupyterLab 3.x. **For JupyterLab 2 or earlier**,
 
 ```
 # JupyterLab 2.x renderer support
-jupyter labextension install [email protected].0 @jupyter-widgets/jupyterlab-manager
+jupyter labextension install [email protected].1 @jupyter-widgets/jupyterlab-manager
 ```
 
 Please check out our [Troubleshooting guide](https://plotly.com/python/troubleshooting/) if you run into any problems with JupyterLab.

Diff for: SECURITY.md

@@ -0,0 +1,12 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.x   | :white_check_mark: |
+| < 5.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Please email [email protected] with any concerns about security.

Diff for: binder/requirements.txt

@@ -1,5 +1,5 @@
 jupytext
-plotly==5.13.0
+plotly==5.13.1
 jupyter
 notebook
 pandas==1.0.3

Diff for: doc/apidoc/conf.py

@@ -28,7 +28,7 @@
 # The short X.Y version
 version = ""
 # The full version, including alpha/beta/rc tags
-release = "5.13.0"
+release = "5.13.1"
 
 
 # -- General configuration ---------------------------------------------------

Diff for: doc/python/dropdowns.md

@@ -5,10 +5,10 @@ jupyter:
     text_representation:
       extension: .md
       format_name: markdown
-      format_version: '1.2'
-      jupytext_version: 1.3.2
+      format_version: '1.3'
+      jupytext_version: 1.14.1
   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.7.3
+    version: 3.8.0
   plotly:
     description: How to add dropdowns to update Plotly chart attributes in Python.
     display_as: controls
@@ -362,26 +362,26 @@ fig = go.Figure()
 # Add Traces
 
 fig.add_trace(
-    go.Scatter(x=list(df.index),
+    go.Scatter(x=list(df.Date),
                y=list(df.High),
                name="High",
                line=dict(color="#33CFA5")))
 
 fig.add_trace(
-    go.Scatter(x=list(df.index),
+    go.Scatter(x=list(df.Date),
                y=[df.High.mean()] * len(df.index),
                name="High Average",
                visible=False,
                line=dict(color="#33CFA5", dash="dash")))
 
 fig.add_trace(
-    go.Scatter(x=list(df.index),
+    go.Scatter(x=list(df.Date),
                y=list(df.Low),
                name="Low",
                line=dict(color="#F06A6A")))
 
 fig.add_trace(
-    go.Scatter(x=list(df.index),
+    go.Scatter(x=list(df.Date),
                y=[df.Low.mean()] * len(df.index),
                name="Low Average",
                visible=False,
@@ -393,17 +393,17 @@ high_annotations = [dict(x="2016-03-01",
                          xref="x", yref="y",
                          text="High Average:<br> %.3f" % df.High.mean(),
                          ax=0, ay=-40),
-                    dict(x=df.High.idxmax(),
+                    dict(x=df.Date[df.High.idxmax()],
                          y=df.High.max(),
                          xref="x", yref="y",
                          text="High Max:<br> %.3f" % df.High.max(),
-                         ax=0, ay=-40)]
+                         ax=-40, ay=-40)]
 low_annotations = [dict(x="2015-05-01",
                         y=df.Low.mean(),
                         xref="x", yref="y",
                         text="Low Average:<br> %.3f" % df.Low.mean(),
                         ax=0, ay=40),
-                   dict(x=df.High.idxmin(),
+                   dict(x=df.Date[df.High.idxmin()],
                         y=df.Low.min(),
                         xref="x", yref="y",
                         text="Low Min:<br> %.3f" % df.Low.min(),

Diff for: doc/python/getting-started.md

@@ -58,13 +58,13 @@ We also encourage you to join the [Plotly Community Forum](http://community.plot
 `plotly` may be installed using `pip`:
 
 ```
-$ pip install plotly==5.13.0
+$ pip install plotly==5.13.1
 ```
 
 or `conda`:
 
 ```
-$ conda install -c plotly plotly=5.13.0
+$ conda install -c plotly plotly=5.13.1
 ```
 This package contains everything you need to write figures to standalone HTML files.
 
@@ -152,7 +152,7 @@ The instructions above apply to JupyterLab 3.x. **For JupyterLab 2 or earlier**,
 
 ```
 # JupyterLab 2.x renderer support
-jupyter labextension install [email protected].0 @jupyter-widgets/jupyterlab-manager
+jupyter labextension install [email protected].1 @jupyter-widgets/jupyterlab-manager
 ```
 
 Please check out our [Troubleshooting guide](/python/troubleshooting/) if you run into any problems with JupyterLab, particularly if you are using multiple python environments inside Jupyter.

Diff for: doc/python/graphing-multiple-chart-types.md

@@ -82,26 +82,49 @@ non_smoker_mean = mean_values_df[mean_values_df.smoker == "No"].sort_values(
 smoker = df[df.smoker == "Yes"].sort_values(by="tip", ascending=False)
 non_smoker = df[df.smoker == "No"].sort_values(by="tip", ascending=False)
 
-fig = go.Figure()
+fig = go.Figure(
+    layout=dict(
+        xaxis=dict(categoryorder="category descending"),
+        yaxis=dict(range=[0, 7]),
+        scattermode="group",
+        legend=dict(groupclick="toggleitem"),
+    )
+)
 
 fig.add_trace(
     go.Bar(
         x=smoker_mean.sex,
         y=smoker_mean.tip,
-        name="Average (Smoker)",
+        name="Average",
         marker_color="IndianRed",
         offsetgroup="smoker",
+        legendgroup="smoker",
+        legendgrouptitle_text="Smoker",
     )
 )
 
 
+fig.add_trace(
+    go.Scatter(
+        x=smoker.sex,
+        y=smoker.tip,
+        mode="markers",
+        name="Individual tips",
+        marker=dict(color="LightSlateGrey", size=5),
+        offsetgroup="smoker",
+        legendgroup="smoker",
+    )
+)
+
 fig.add_trace(
     go.Bar(
         x=non_smoker_mean.sex,
         y=non_smoker_mean.tip,
-        name="Average (Non-Smoker)",
+        name="Average",
         marker_color="LightSalmon",
         offsetgroup="non-smoker",
+        legendgroup="non-smoker",
+        legendgrouptitle_text="Non-Smoker",
     )
 )
 
@@ -111,27 +134,14 @@ fig.add_trace(
         x=non_smoker.sex,
         y=non_smoker.tip,
         mode="markers",
-        name="Individual tips (Non-Smoker)",
+        name="Individual tips",
         marker=dict(color="LightSteelBlue", size=5),
         offsetgroup="non-smoker",
+        legendgroup="non-smoker",
     )
 )
 
-fig.add_trace(
-    go.Scatter(
-        x=smoker.sex,
-        y=smoker.tip,
-        mode="markers",
-        name="Individual tips (Smoker)",
-        marker=dict(color="LightSlateGrey", size=5),
-        offsetgroup="smoker",
-    )
-)
-
-fig.update_layout(scattermode="group")
-
 fig.show()
-
 ```
 
 #### Line Chart and a Bar Chart

Diff for: doc/python/sankey-diagram.md

@@ -10,7 +10,7 @@ jupyter:
   kernel_info:
     name: python2
   kernelspec:
-    display_name: Python 3
+    display_name: Python 3 (ipykernel)
     language: python
     name: python3
   language_info:
@@ -214,6 +214,34 @@ fig = go.Figure(go.Sankey(
 fig.show()
 ```
 
+### Sankey Diagram with Arrow Links
+
+*New in 5.10*
+
+Create a Sankey diagram with arrow links by setting the `arrowlen` attribute of `link`:
+
+```python
+import plotly.graph_objects as go
+
+fig = go.Figure(go.Sankey(
+    arrangement='snap',
+    node=dict(
+        label=['A', 'B', 'C', 'D', 'E', 'F'],
+        x=[0.2, 0.1, 0.5, 0.7, 0.3, 0.5],
+        y=[0.7, 0.5, 0.2, 0.4, 0.2, 0.3],
+        pad=10  
+    ),
+    link=dict(
+        arrowlen=15,
+        source=[0, 0, 1, 2, 5, 4, 3, 5],
+        target=[5, 3, 4, 3, 0, 2, 2, 3],
+        value=[1, 2, 1, 1, 1, 1, 1, 2]  
+    )
+))
+
+fig.show()
+```
+
 ### Reference
 
 See [https://plotly.com/python/reference/sankey](https://plotly.com/python/reference/sankey/) for more information and options!

Diff for: doc/requirements.txt

@@ -1,4 +1,4 @@
-plotly==5.13.0
+plotly==5.13.1
 jupytext==1.1.1
 ipywidgets==7.7.2
 jupyter-client<7
@@ -36,3 +36,4 @@ nbconvert==5.6.1
 orjson
 dash-bio
 jinja2<3.1
+parmed<=3.4.4; python_version<"3.8"