Merge branch 'main' into codegen2

Author: gvwilson

Diff for: .circleci/config.yml

@@ -24,7 +24,7 @@ commands:
           name: Test core
           command: |
             . venv/bin/activate
-            pytest tests/test_core
+            python -m pytest tests/test_core
           no_output_timeout: 20m
 
   test_optional:
@@ -39,51 +39,52 @@ commands:
       - run:
           name: Install dependencies
           command: |
-            python -m venv venv
-            . venv/bin/activate
-            pip install -e .
-            pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
+            curl -LsSf https://astral.sh/uv/install.sh | sh
+            uv venv
+            source .venv/bin/activate
+            uv pip install .
+            uv pip install -r ./test_requirements/requirements_<<parameters.py>>_optional.txt
             cd js
             npm ci
             npm run build
       - run:
           name: Install plotly-geo
           command: |
-            . venv/bin/activate
-            pip install plotly-geo
+            source .venv/bin/activate
+            uv pip install plotly-geo
       - run:
           name: Test core
           command: |
-            . venv/bin/activate
-            pytest tests/test_core
+            source .venv/bin/activate
+            python -m pytest tests/test_core
           no_output_timeout: 20m
       - run:
           name: Test optional
           command: |
-            . venv/bin/activate
-            pytest tests/test_optional
+            source .venv/bin/activate
+            python -m pytest tests/test_optional
           no_output_timeout: 40m
       - run:
           name: Test utils
           command: |
-            . venv/bin/activate
-            pytest tests/test_plotly_utils/
+            source .venv/bin/activate
+            python -m pytest tests/test_plotly_utils/
           no_output_timeout: 20m
       - run:
           name: Test io
           command: |
-            . venv/bin/activate
-            pytest tests/test_io
+            source .venv/bin/activate
+            python -m pytest tests/test_io
           no_output_timeout: 20m
       - run:
-          name: Test dependencdies not imported
+          name: Test dependencies not imported
           command: |
-            . venv/bin/activate
+            source .venv/bin/activate
             python -m pytest -x test_init/test_dependencies_not_imported.py
       - run:
           name: Test lazy imports
           command: |
-            . venv/bin/activate
+            source .venv/bin/activate
             python -m pytest -x test_init/test_lazy_imports.py
   test_orca:
     parameters:
@@ -392,25 +393,21 @@ jobs:
             - "dc:5f:39:48:00:b4:72:34:e1:d2:c4:e1:1f:d1:e2:ce" #plotlydocbot
 
       - checkout
-
-      # Download and cache dependencies
-      - restore_cache:
-          key: v2-dependencies-{{ checksum "doc/requirements.txt" }}-{{ checksum ".circleci/config.yml" }}
       - browser-tools/install-chrome
       - browser-tools/install-chromedriver
 
       - run:
           name: install dependencies
           command: |
             cd doc
-            python -m venv venv
-            . venv/bin/activate
-            pip uninstall -y plotly
-            pip install -r requirements.txt
+            curl -LsSf https://astral.sh/uv/install.sh | sh
+            uv venv
+            source .venv/bin/activate
+            uv pip install -r requirements.txt
             if [ "${CIRCLE_BRANCH}" != "doc-prod" ]; then
-              pip uninstall -y plotly
+              uv pip uninstall plotly
               cd ..
-              pip install -e .
+              uv pip install -e .
               cd js
               npm ci
               npm run build
@@ -426,17 +423,11 @@ jobs:
             sudo apt-get install -y poppler-utils libxtst6 xvfb libgtk2.0-0 libgconf-2-4 libnss3 libasound2 rename
             echo 'export PATH="/home/circleci/project/node_modules/.bin:$PATH"' >> $BASH_ENV
 
-      - save_cache:
-          paths:
-            - ./doc/venv
-            - ./doc/node_modules
-          key: v1-dependencies-{{ checksum "doc/requirements.txt" }}-{{ checksum ".circleci/config.yml" }}
-
       - run:
           name: make html
           command: |
             cd doc
-            . venv/bin/activate
+            source .venv/bin/activate
             echo ${mapbox_token} > python/.mapbox_token
             make -kj8 || make -kj8
             curl https://raw.githubusercontent.com/plotly/graphing-library-docs/master/front-matter-ci.py > front-matter-ci.py
@@ -485,14 +476,14 @@ jobs:
           name: make doc
           command: |
             cd doc
-            . venv/bin/activate
+            source .venv/bin/activate
             # For the API doc, we need to use the local version of plotly
             # since we are tweaking the source because of
             # graph_objs/graph_objects
             if [ "${CIRCLE_BRANCH}" == "doc-prod" ]; then
-              pip uninstall -y plotly
+              uv pip uninstall plotly
               cd ..
-              pip install -e .
+              uv pip install -e .
               cd doc
               cd apidoc
               make html

Diff for: .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 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/).
 
+## [6.0.1] - 2025-02-16
+
+### Fixed
+- Fix `TypeError` when using `orjson` to serialize `pandas.NA`.
+
 ## [6.0.0] - 2025-01-28
 
 ### Added

Diff for: 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 for: 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 for: 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 for: 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 for: binder/requirements.txt

@@ -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 for: doc/README.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 for: doc/python/getting-started.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 for: doc/python/performance.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 for: doc/python/v6-changes.md

@@ -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 for: plotly/io/_json.py

@@ -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 for: pyproject.toml

@@ -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"