Merge branch 'master' into handle_spacing_with_spec

Author: stephenpardy

Diff for: .circleci/config.yml

@@ -150,6 +150,15 @@ jobs:
       - test_optional:
           py: "39"
 
+  # Pandas
+
+  python_39_pandas_2_optional:
+    docker:
+      - image: circleci/python:3.9-buster-node-browsers
+    steps:
+      - test_optional:
+          py: "39_pandas_2"
+
   # Orca
   python_38_orca:
     docker:
@@ -470,6 +479,7 @@ workflows:
       - python_37_optional
       - python_38_optional
       - python_39_optional
+      - python_39_pandas_2_optional
       - python_38_orca
       - python_37_percy
       - build-doc

Diff for: 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/).
 
+## [5.14.1] - 2023-04-05
+
+### Fixed
+  - Fixed compatibility issue with Pandas 2.0 [[#4103](https://github.com/plotly/plotly.py/pull/4103)]
+
 ## [5.14.0] - 2023-03-29
 
 ### Updated

Diff for: README.md

@@ -33,7 +33,7 @@
 
 ## Quickstart
 
-`pip install plotly==5.14.0`
+`pip install plotly==5.14.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.14.0
+pip install plotly==5.14.1
 ```
 
 or conda.
 
 ```
-conda install -c plotly plotly=5.14.0
+conda install -c plotly plotly=5.14.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: binder/requirements.txt

@@ -1,5 +1,5 @@
 jupytext
-plotly==5.14.0
+plotly==5.14.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.14.0"
+release = "5.14.1"
 
 
 # -- General configuration ---------------------------------------------------

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.14.0
+$ pip install plotly==5.14.1
 ```
 
 or `conda`:
 
 ```
-$ conda install -c plotly plotly=5.14.0
+$ conda install -c plotly plotly=5.14.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/horizontal-vertical-shapes.md

@@ -145,7 +145,6 @@ fig.show()
 
 [Text labels on shapes](/python/shapes/#addingtextlabelstoshapes), introduced in version 5.14, is now the recommended way to add text to shapes. The above examples using `add_hline`, `add_vrect`, `add_hrect`, and `add_vline` that add annotations can be rewritten to use `label`.
 
-
 ```python
 import plotly.express as px
 
@@ -177,7 +176,7 @@ fig.show()
 
 ```
 
-With [text labels on shapes](/python/shapes/#addingtextlabelstoshapes), you can also add text labels to shapes other than lines and rectangles, and the labels can be added automatically to shapes drawn by the user. 
+With [text labels on shapes](/python/shapes/#adding-text-labels-to-shapes), you can also add text labels to shapes other than lines and rectangles, and the labels can be added automatically to shapes drawn by the user. 
 
 
 ### Reference

Diff for: doc/requirements.txt

@@ -1,4 +1,4 @@
-plotly==5.14.0
+plotly==5.14.1
 jupytext==1.1.1
 ipywidgets==7.7.2
 jupyter-client<7

Diff for: packages/javascript/jupyterlab-plotly/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab-plotly",
-  "version": "5.14.0",
+  "version": "5.14.1",
   "description": "The plotly Jupyter extension",
   "author": "The plotly.py team",
   "license": "MIT",

Diff for: packages/javascript/jupyterlab-plotly/package.json

@@ -40,7 +40,7 @@ def color_validator(request):
         "uint16",
         "uint32",
         "uint64",
-        "float16",
+        # "float16",
         "float32",
         "float64",
     ]

Diff for: packages/python/plotly/_plotly_utils/tests/validators/test_pandas_series_input.py

@@ -40,7 +40,7 @@ def color_validator(request):
         "uint16",
         "uint32",
         "uint64",
-        "float16",
+        # "float16",
         "float32",
         "float64",
     ]

Diff for: packages/python/plotly/_plotly_utils/tests/validators/test_xarray_input.py

@@ -102,7 +102,8 @@ def plot(data_frame, kind, **kwargs):
     if kind == "line":
         return line(data_frame, **kwargs)
     if kind == "area":
-        return area(data_frame, **kwargs)
+        new_kwargs = {k: kwargs[k] for k in kwargs if k not in ["stacked"]}
+        return area(data_frame, **new_kwargs)
     if kind == "bar":
         return bar(data_frame, **kwargs)
     if kind == "barh":

Diff for: packages/python/plotly/plotly/__init__.py

@@ -2,4 +2,4 @@
 # for automated dev builds
 #
 # It is edited by hand prior to official releases
-__frontend_version__ = "^5.14.0"
+__frontend_version__ = "^5.14.1"

Diff for: packages/python/plotly/plotly/_widget_version.py

@@ -1682,7 +1682,9 @@ def process_dataframe_timeline(args):
         )
 
     # note that we are not adding any columns to the data frame here, so no risk of overwrite
-    args["data_frame"][args["x_end"]] = (x_end - x_start).astype("timedelta64[ms]")
+    args["data_frame"][args["x_end"]] = (x_end - x_start).astype(
+        "timedelta64[ns]"
+    ) / np.timedelta64(1, "ms")
     args["x"] = args["x_end"]
     del args["x_end"]
     args["base"] = args["x_start"]

Diff for: packages/python/plotly/plotly/express/_core.py

@@ -15,7 +15,7 @@
 import numpy as np
 import pandas as pd
 import pytz
-from pandas.util.testing import assert_series_equal
+from pandas.testing import assert_series_equal
 import json as _json
 import os
 import base64

Diff for: packages/python/plotly/plotly/tests/test_optional/test_utils/test_utils.py

@@ -0,0 +1,21 @@
+requests==2.25.1
+tenacity==6.2.0
+pandas==2.0.0
+numpy==1.20.3
+xarray==0.17.0
+statsmodels
+Pillow==8.2.0
+pytest==6.2.3
+pytz==2021.1
+ipython[all]==7.22.0
+ipywidgets==8.0.2
+ipykernel==5.5.3
+jupyter==1.0.0
+scipy==1.6.2
+Shapely==1.7.1
+geopandas==0.9.0
+pyshp==2.1.3
+matplotlib==2.2.3
+scikit-image==0.18.1
+psutil==5.7.0
+kaleido

Diff for: packages/python/plotly/test_requirements/requirements_39_pandas_2_optional.txt

@@ -35,7 +35,7 @@ Manually update the versions to `X.Y.Z` in the files specified below.
 
  - `CHANGELOG.md`
    + update the release date
- - `packages/python/plotly/README.md`
+ - `README.md`
    + this must be done at this point because the README gets baked into PyPI
  - `plotly/_widget_version.py`:
    + Update `__frontend_version__` to `^X.Y.Z` (Note the `^` prefix)