Merge branch 'main' into upgrade-kaleido

emilykl · emilykl · commit a7a6f24f187b · 2025-03-04T12:11:46.000-05:00
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -7,7 +7,7 @@ below :-).
 ### Documentation PR
 
 - [ ] I've [seen the `doc/README.md` file](https://github.com/plotly/plotly.py/blob/master/doc/README.md)
-- [ ] This change runs in the current version of Plotly on PyPI and targets the `doc-prod` branch OR it targets the `master` branch
+- [ ] This change runs in the current version of Plotly on PyPI and targets the `doc-prod` branch OR it targets the `main` branch
 - [ ] If this PR modifies the first example in a page or adds a new one, it is a `px` example if at all possible
 - [ ] Every new/modified example has a descriptive title and motivating sentence or paragraph
 - [ ] Every new/modified example is independently runnable
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/).
 
+## [6.0.1] - 2025-02-16
+
+### Fixed
+- Fix `TypeError` when using `orjson` to serialize `pandas.NA`.
+
 ## [6.0.0] - 2025-01-28
 
 ### Added
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -198,7 +198,7 @@ a PR as follows.
 
 ### Making a Development Branch
 
-Third, *don't* work in the `master` branch. As soon as you get your master branch ready, run:
+Third, *don't* work in the `main` branch. As soon as you get your main branch ready, run:
 
 **DO THIS (but change the branch name)**
 ```bash
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,3 @@
 include LICENSE.txt
 include README.md
-include requires-install.txt
-include requires-express.txt
 include plotly/package_data/widgetbundle.js
diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ pip install plotly
 or conda.
 
 ```
-conda install -c plotly plotly
+conda install -c conda-forge plotly
 ```
 
 ### Jupyter Widget Support
diff --git a/RELEASE.md b/RELEASE.md
@@ -33,7 +33,7 @@ Manually update the versions to `X.Y.Z` in the files specified below.
  - Create a tag for Github release
    + `git tag vX.Y.Z`
    + `git push --atomic origin release-X.Y.Z vX.Y.Z`
- - Create a Github pull request from `release-X.Y.Z` to `master` and wait for CI to be green
+ - Create a Github pull request from `release-X.Y.Z` to `main` and wait for CI to be green
 
 ### Download and QA CI Artifacts
 
@@ -62,7 +62,7 @@ Publishing to PyPI:
 
 ### Merge the PR and make a Release
 
-1. Merge the pull request you created above into `master`
+1. Merge the pull request you created above into `main`
 2. Go to https://github.com/plotly/plotly.py/releases and "Draft a new release"
 3. Enter the `vX.Y.Z` tag you created already above and make "Release title" the same string as the tag.
 4. Copy the changelog section for this version as the "Describe this release"
@@ -73,9 +73,8 @@ Publishing to PyPI:
     - `doc/python/getting-started.md`
     - `doc/apidoc/conf.py`
     - `doc/requirements.txt`
-    - `binder/requirements.txt`
-2. `doc-prod` should already have been merged on a regular basis into `master`, but
-start by doing it first if not. Then merge `master` into `doc-prod` to deploy the doc related
+2. `doc-prod` should already have been merged on a regular basis into `main`, but
+start by doing it first if not. Then merge `main` into `doc-prod` to deploy the doc related
 to features in the release.
 3. in a clone of the [`graphing-library-docs` repo](https://github.com/plotly/graphing-library-docs):
     1. bump the version of Plotly.py in  `_data/pyversion.json`
diff --git a/binder/requirements.txt b/binder/requirements.txt
diff --git a/doc/README.md b/doc/README.md
@@ -41,7 +41,7 @@ released, or which has just been included but not yet released.
   your branch off the `doc-prod` branch and open your pull request against this
   `doc-prod` branch.
 - Case of a new (not released yet) feature: start your branch / pull request
-  against the `master` branch. `master` and `doc-prod` will be synchronized at
+  against the `main` branch. `main` and `doc-prod` will be synchronized at
   release time, so that the documentation of the feature is only deployed when
   it is available in a released version of `plotly.py`.
 
diff --git a/doc/python/getting-started.md b/doc/python/getting-started.md
@@ -64,7 +64,7 @@ $ pip install plotly
 or `conda`:
 
 ```
-$ conda install -c plotly plotly
+$ conda install -c conda-forge plotly
 ```
 
 If you want to use Plotly Express, install its required dependencies with:
diff --git a/doc/python/performance.md b/doc/python/performance.md
@@ -78,6 +78,10 @@ The following [array data types](https://numpy.org/devdocs/reference/arrays.scal
 
 Arrays or data types that are not supported for base64 encoding to Plotly.js's typed arrays specification will still work and render correctly with Plotly. Those arrays and or data types just won't have the performance benefits that Plotly.js's base64 typed arrays feature provides.
 
+### Dash Design Kit Compatibility
+
+The Dash Design Kit `Graph` component from versions of Dash Design Kit earlier than 1.13 doesn't work with Plotly.py version 6 when using Python objects listed in the previous "Arrays and Data Types Supported". Upgrade Dash Design Kit to 1.13 or later to resolve this issue.
+
 ### Unsupported Attributes
 
 Arrays passed to attributes with the following names are not supported for base64 encoding for rendering with Plotly.js.
diff --git a/doc/python/v6-changes.md b/doc/python/v6-changes.md
@@ -57,9 +57,12 @@ pip install anywidget
 
 Plotly.py now takes advantage of recent changes in how Plotly.js handles typed arrays for improved performance. See the [performance page](https://plotly.com/python/performance/) for more details.
 
+> If you are using Plotly.py 6 or later with Dash Design Kit, you may need to upgrade your Dash Design Kit version. See the [Dash Design Kit Compatibility section on the performance page](/python/performance/#dash-design-kit-compatibility) for more details.
+
+
 ## Dataframe Support
 
-Plotly Express now uses [Narwhals](https://narwhals-dev.github.io/narwhals/) to natively support pandas, Polars, and PyArrow. With this change, the [performance](https://plotly.com/python/performance/) of using Polars or PyArrow with Plotly Express is significantly improved. 
+Plotly Express now uses [Narwhals](https://narwhals-dev.github.io/narwhals/) to natively support pandas, Polars, and PyArrow. With this change, the [performance](https://plotly.com/python/performance/) of using Polars or PyArrow with Plotly Express is significantly improved.
 
 ## Mapbox Deprecation
 
diff --git a/plotly/io/_json.py b/plotly/io/_json.py
@@ -529,7 +529,7 @@ def clean_to_json_compatible(obj, **kwargs):
 
     # pandas
     if pd is not None:
-        if obj is pd.NaT:
+        if obj is pd.NaT or obj is pd.NA:
             return None
         elif isinstance(obj, (pd.Series, pd.DatetimeIndex)):
             if numpy_allowed and obj.dtype.kind in ("b", "i", "u", "f"):
diff --git a/pyproject.toml b/pyproject.toml
@@ -38,9 +38,14 @@ classifiers = [
 requires-python = ">=3.8"
 license = {file="LICENSE.txt"}
 version = "6.0.0"
-dynamic = ["dependencies"]
+dependencies = [
+    "narwhals>=1.15.1",
+    "packaging"
+]
+
+[project.optional-dependencies]
+express = ["numpy"]
 
-# TODO: check that this works
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["plotly*", "_plotly*"]
diff --git a/requires-express.txt b/requires-express.txt
diff --git a/requires-install.txt b/requires-install.txt
diff --git a/tests/test_io/test_to_from_plotly_json.py b/tests/test_io/test_to_from_plotly_json.py
@@ -260,3 +260,9 @@ def test_sanitize_json(engine):
     for bad, good in replacements.items():
         assert bad not in fig_json
         assert good in fig_json
+
+
+@pytest.mark.parametrize("na_value", [np.nan, pd.NaT, pd.NA])
+def test_na_values(engine, na_value):
+    result = pio.to_json_plotly(na_value, engine=engine)
+    assert result == "null"
