Merge branch 'main' into patch-2

Author: LiamConnors

Diff for: .circleci/config.yml

@@ -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
@@ -27,7 +27,7 @@ below :-).
 
 ## Code PR
 
-- [ ] I have read through the [contributing notes](https://github.com/plotly/plotly.py/blob/master/contributing.md) and understand the structure of the package. In particular, if my PR modifies code of `plotly.graph_objects`, my modifications concern the `codegen` files and not generated files.
+- [ ] I have read through the [contributing notes](https://github.com/plotly/plotly.py/blob/master/CONTRIBUTING.md) and understand the structure of the package. In particular, if my PR modifies code of `plotly.graph_objects`, my modifications concern the `codegen` files and not generated files.
 - [ ] I have added tests (if submitting a new feature or correcting a bug) or
   modified existing tests.
 - [ ] For a new feature, I have added documentation examples in an existing or

Diff for: .gitattributes

@@ -0,0 +1,67 @@
+name: Publish Python 🐍 distribution 📦 to PyPI and TestPyPI
+
+on:
+  workflow_dispatch
+
+jobs:
+  build:
+    name: Build distribution 📦
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.x"
+    
+    - name: Install Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '18'
+
+    - name: Install npm dependencies
+      run: |
+        cd js
+        npm ci --verbose
+        npm run build --verbose
+
+    - name: Install pypa/build
+      run: >-
+        python3 -m
+        pip install
+        build
+        --user
+    - name: Build a binary wheel and a source tarball
+      run: python3 -m build
+    - name: Store the distribution packages
+      uses: actions/upload-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  publish-to-testpypi:
+    name: Publish Python 🐍 distribution 📦 to TestPyPI
+    needs:
+    - build
+    runs-on: ubuntu-latest
+
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/plotly
+
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution 📦 to TestPyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/

Diff for: .github/pull_request_template.md

@@ -1,7 +1,7 @@
 0
 0.html
 iframe_figures/
-plotly/tests/test_orca/images/linux/failed/
+tests/test_orca/images/linux/failed/
 
 *.egg-info
 
@@ -49,20 +49,17 @@ plotly.egg-info/
 # macOS utility file
 **/.DS_Store
 
-plotly/tests/test_orca/images/*/failed
-plotly/tests/test_orca/images/*/tmp
-/plotly-package/plotly/tests/test_core/test_offline/plotly.min.js
+tests/test_orca/images/*/failed
+tests/test_orca/images/*/tmp
+tests/test_core/test_offline/plotly.min.js
 temp-plot.html
 .vscode
 doc/python/.ipynb_checkpoints
 doc/python/.mapbox_token
 doc/.ipynb_checkpoints
 tags
 doc/check-or-enforce-order.py
-
-jupyterlab_plotly/labextension/
-jupyterlab_plotly/nbextension/index.js*
 plotly/package_data/widgetbundle.js
 
-test/percy/*.html
-test/percy/pandas2/*.html
+tests/percy/*.html
+tests/percy/pandas2/*.html

Diff for: .github/workflows/test-release.yml

@@ -1,7 +1,24 @@
-# Change Log
+# Changelog
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Unreleased
+
+### Fixed
+- Fix third-party widget display issues in v6 [[#5102]https://github.com/plotly/plotly.py/pull/5102]
+
+## [6.0.1] - 2025-03-14
+
+### Updated
+- Updated Plotly.js from version 3.0.0 to version 3.0.1. See the [plotly.js CHANGELOG](https://github.com/plotly/plotly.js/blob/master/CHANGELOG.md#301----2025-02-18) for more information.
+
+
+### Fixed
+- Fix `TypeError` when using `orjson` to serialize `pandas.NA` [[#5040](https://github.com/plotly/plotly.py/pull/5040)].
+- Fix issue where using `category_orders` on `px.pie` raised `ColumnNotFoundError` [[#5000](https://github.com/plotly/plotly.py/pull/5000)].
+- Fix incorrect `DeprecationWarning` shown when creating a `px` chart [[#5080](https://github.com/plotly/plotly.py/pull/5080), [#5086](https://github.com/plotly/plotly.py/pull/5086)]
+
+
 ## [6.0.0] - 2025-01-28
 
 ### Added
@@ -716,7 +733,7 @@ This version includes several performance improvements ([#2368](https://github.c
     - Introduce range breaks on date axes (for example, to remove week-ends) via `layout.xaxis.rangebreaks`
     - Introduce a new unified x (or y) hovermode (`layout.hovermode="x unified"`), in which the hover box shows the information for all traces at a given x (or y) position
     - Add `node.customdata` and `link.customdata` to sankey traces
-- Updated [contributing notes](https://github.com/plotly/plotly.py/blob/master/contributing.md) for more explanations on how to contribute to plotly.py [#2290](https://github.com/plotly/plotly.py/pull/2290). Please give feedback on these notes!
+- Updated [contributing notes](https://github.com/plotly/plotly.py/blob/master/CONTRIBUTING.md) for more explanations on how to contribute to plotly.py [#2290](https://github.com/plotly/plotly.py/pull/2290). Please give feedback on these notes!
 - Updated documentation examples [#2325](https://github.com/plotly/plotly.py/pull/2325), and to show how to color links in Sankey diagrams [#2291](https://github.com/plotly/plotly.py/pull/2291).
 - Special thanks to [@SylwiaOliwia2](https://github.com/SylwiaOliwia2) and [@dangercrow](https://github.com/dangercrow) for improving our documentation!
 
@@ -1738,7 +1755,7 @@ This is a major version with many exciting updates. See the [Introducing plotly.
 - Error message for `plotly.figure_factory.create_choropleth` is now helpful to Anaconda users who do not have the correct modules installed for the County Choropleth figure factory.
 
 ### Changed / Deprecated
-Please see the [migration guid](migration-guide.md) for a full list of the changes and deprecations in version 3.0.0
+Please see the [migration guide](MIGRATION_GUIDE.md) for a full list of the changes and deprecations in version 3.0.0
 
 
 

Diff for: .gitignore

@@ -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
@@ -219,7 +219,7 @@ First update the version of the `plotly.js` dependency in `js/package.json`.
 Then run the `updateplotlyjs` command with:
 
 ```bash
-$ python setup.py updateplotlyjs
+$ python commands.py updateplotlyjs
 ```
 
 This will download new versions of `plot-schema.json` and `plotly.min.js` from
@@ -233,7 +233,7 @@ For dev branches, it is also possible to use `updateplotlyjsdev` in two configur
 
 If your devbranch is part of the official plotly.js repository, you can use
 ```bash
-python setup.py updateplotlyjsdev --devrepo reponame --devbranch branchname
+python commands.py updateplotlyjsdev --devrepo reponame --devbranch branchname
 ```
 to update to development versions of `plotly.js`. This will fetch the `plotly.js` in the CircleCI artifact of the branch `branchname` of the repo `reponame`. If `--devrepo` or `--devbranch` are omitted, `updateplotlyjsdev` defaults using `plotly/plotly.js` and `master` respectively.
 
@@ -249,7 +249,7 @@ $ npm pack
 $ mv plotly.js-*.tgz plotly.js.tgz
 
 # In your plotly.py/ directory:
-$ python setup.py updateplotlyjsdev --local /path/to/your/plotly.js/
+$ python commands.py updateplotlyjsdev --local /path/to/your/plotly.js/
 ```
 
 ## Testing
@@ -263,31 +263,31 @@ Since our tests cover *all* the functionality, to prevent tons of errors from sh
 After you've done that, go ahead and run the test suite!
 
 ```bash
-pytest plotly/tests/
+pytest tests/
 ```
 
 Or for more *verbose* output:
 
 ```bash
-pytest -v plotly/tests/
+pytest -v tests/
 ```
 
 Either of those will run *every* test we've written for the Python API. You can get more granular by running something like:
 
 ```bash
-pytest plotly/tests/test_core/
+pytest tests/test_core/
 ```
 
 ... or even more granular by running something like:
 
 ```bash
-pytest plotly/tests/test_plotly/test_plot.py
+pytest tests/test_plotly/test_plot.py
 ```
 
 or for a specific test function
 
 ```bash
-pytest plotly/tests/test_plotly/test_plot.py::test_function
+pytest tests/test_plotly/test_plot.py::test_function
 ```
 
 ### Writing Tests

Diff for: CHANGELOG.md

@@ -1,7 +1,3 @@
 include LICENSE.txt
 include README.md
-include versioneer.py
-include plotly/_version.py
-include requires-install.txt
-include requires-express.txt
 include plotly/package_data/widgetbundle.js

Diff for: contributing.md renamed to CONTRIBUTING.md

@@ -67,7 +67,7 @@ Built on top of [plotly.js](https://github.com/plotly/plotly.js), `plotly.py` is
 ---
 
 - [Online Documentation](https://plotly.com/python/)
-- [Contributing to plotly](https://github.com/plotly/plotly.py/blob/master/contributing.md)
+- [Contributing to plotly](https://github.com/plotly/plotly.py/blob/master/CONTRIBUTING.md)
 - [Changelog](https://github.com/plotly/plotly.py/blob/master/CHANGELOG.md)
 - [Code of Conduct](https://github.com/plotly/plotly.py/blob/master/CODE_OF_CONDUCT.md)
 - [Community forum](https://community.plotly.com)
@@ -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: MANIFEST.in

@@ -24,47 +24,30 @@ a link to the plotly.js CHANGELOG.
 
 Manually update the versions to `X.Y.Z` in the files specified below.
 
+ - `pyproject.toml`
+   + update version
  - `CHANGELOG.md`
    + update the release date
- - `plotly/_widget_version.py`:
-   + Update `__frontend_version__` to `^X.Y.Z` (Note the `^` prefix)
  - Commit your changes on the branch:
    + `git commit -a -m "version changes for vX.Y.Z"`
-
- ### Triggering (and Retriggering) the build
-
- - Commit and add this specific tag which `versioneer` will pick up, and push to Github so that CI will build the release artifacts. This is an atomic push so that CI will read the tag on the commit:
+ - 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
- - *If something goes wrong below*, you'll need to trigger the build process again after a fix. You'll need to commit your changes in the release branch, move the tag and atomically force push:
-   + `git commit ....`
-   + `git tag -f vX.Y.Z`
-   + `git push --force --atomic origin release-X.Y.Z vX.Y.Z`
+ - Create a Github pull request from `release-X.Y.Z` to `main` and wait for CI to be green
 
 ### Download and QA CI Artifacts
 
 The `full_build` job in the `release_build` workflow in CircleCI produces a tarball of artifacts `output.tgz` which you should download and decompress, which will give you a directory called `output`. The filenames contained within will contain version numbers.
 
-**Note: if any of the version numbers are not simply `X.Y.Z` but include some kind of git hash, then this is a dirty build and you'll need to clean up whatever is dirtying the tree and follow the instructions above to trigger the build again.** (That said, you can do QA on dirty builds, you just can't publish them.)
-
 To locally install the PyPI dist, make sure you have an environment with JupyterLab installed (maybe one created with `conda create -n condatest python=3.10 jupyter anywidget pandas`):
 
 - `tar xzf output.tgz`
 - `pip uninstall plotly`
 - `conda uninstall plotly` (just in case!)
 - `pip install path/to/output/dist/plotly-X.Y.X-py3-none-any.whl`
 
-To locally install the Conda dist (generally do this in a different, clean environment from the one above!):
-
-- `conda uninstall plotly`
-- `pip uninstall plotly` (just in case!)
-- `conda install path/to/output/plotly-X.Y.Z.tar.bz2`
-
 You'll want to check, in both Lab and Notebook, **in a brand new notebook in each** so that there is no caching of previous results, that `go.Figure()` and `go.FigureWidget()` work without error.
 
-If something is broken, you'll need to fix it and trigger the build again (see above section).
-
 ### Publishing
 
 Once you're satisfied that things render in Lab and Notebook in Widget and regular mode,
@@ -73,34 +56,24 @@ you can publish the artifacts. **You will need special credentials from Plotly l
 
 Publishing to PyPI:
 ```bash
-(plotly_dev) $ cd path/to/output/dist
-(plotly_dev) $ twine upload plotly-X.Y.Z*
-```
-
-Publishing to `plotly` conda channel (make sure you have run `conda install anaconda-client` to get the `anaconda` command):
-
-```
 (plotly_dev) $ cd path/to/output
-(plotly_dev) $ anaconda upload plotly-X.Y.Z.tar.bz2
+(plotly_dev) $ twine upload plotly-X.Y.Z*
 ```
 
-
 ### 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"
 
 ### Update documentation site
 
 1. Search for the previous version string in the docs and replace it with the new version string, including but not necessarily limited to the following files:
-    - `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`
@@ -131,12 +104,3 @@ PyPI RC (no special flags, just the `rc1` suffix):
 
 The `--tag next` part ensures that users won't install this version unless
 they explicitly ask for the version or for the version with the `next` tag.
-
-Conda RC:
-
-```
-$ anaconda upload --label test plotly-*.tar.bz2
-```
-
-The `--label test` part ensures that users won't install this version unless
-they explicitly ask for the version or for the version with the `next` tag.