Merge with master

Author: marthacryan

.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,46 +39,47 @@ commands:
       - run:
           name: Install dependencies
           command: |
-            python -m venv venv
-            . venv/bin/activate
-            pip install -e .
-            pip install -r ./test_requirements/requirements_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_optional.txt
             cd js
             npm ci
             npm run build
       - 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
 
 jobs:
@@ -235,24 +236,24 @@ jobs:
           name: Build html figures (Pandas 2)
           command: |
             . venv/bin/activate
-            python test/percy/plotly-express.py
+            python tests/percy/plotly-express.py
       - run:
           name: Build html figures (Pandas 1) and compare
           command: |
             . venv/bin/activate
-            mkdir test/percy/pandas2
-            mv test/percy/*.html test/percy/pandas2/
+            mkdir tests/percy/pandas2
+            mv tests/percy/*.html tests/percy/pandas2/
             # 1.1 is the earliest minor with Py3.9 wheels
             pip install "pandas==1.1.5"
-            python test/percy/plotly-express.py
-            python test/percy/compare-pandas.py
-            rm -rf test/percy/pandas2
+            python tests/percy/plotly-express.py
+            python tests/percy/compare-pandas.py
+            rm -rf tests/percy/pandas2
       - run:
           name: Run percy snapshots
           command: |
             npm i @percy/cli
-            npx percy snapshot -c test/percy/snapshots.yml test/percy/
-            rm test/percy/*.html
+            npx percy snapshot -c tests/percy/snapshots.yml tests/percy/
+            rm tests/percy/*.html
 
   plotlyjs_dev_build:
     docker:
@@ -351,43 +352,33 @@ 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
               cd ../doc
             fi
             cd ..
 
-      - 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
@@ -436,14 +427,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

.github/pull_request_template.md

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

.gitignore

@@ -61,5 +61,5 @@ tags
 doc/check-or-enforce-order.py
 plotly/package_data/widgetbundle.js
 
-test/percy/*.html
-test/percy/pandas2/*.html
+tests/percy/*.html
+tests/percy/pandas2/*.html

CHANGELOG.md

@@ -716,7 +716,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 +1738,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
 
 
 

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)

migration-guide.md renamed to MIGRATION_GUIDE.md

@@ -25,10 +25,10 @@ where you can edit the page on Github).
 
 For more important edits where you need to run the notebook to check the output,
 clone the repository and setup an environment as described in the [main
-contributing notes](../contributing.md). If you're writing documentation at the
+contributing notes](../CONTRIBUTING.md). If you're writing documentation at the
 same time as you are developing a feature, make sure to install with editable
 install (`pip install -e`, as described in [main
-contributing notes](../contributing.md)), so that you only need to restart
+contributing notes](../CONTRIBUTING.md)), so that you only need to restart
 the Jupyter kernel when you have changed the source code of the feature.
 
 ### Branches

README.md

@@ -161,7 +161,7 @@ $ git push origin add-ff-type
 
 ## Be Part of the Discussion
 
-Go check out your newly pushed branch at https://github.com/plotly/plotly.py. If you have any other questions, check out the [Plotly Contributing Page](https://github.com/plotly/plotly.py/blob/master/contributing.md). Thanks for contributing to Plotly's Graphing Library!
+Go check out your newly pushed branch at https://github.com/plotly/plotly.py. If you have any other questions, check out the [Plotly Contributing Page](https://github.com/plotly/plotly.py/blob/master/CONTRIBUTING.md). Thanks for contributing to Plotly's Graphing Library!
 
 ### Table of Current Figure Factories
 | Name              | Documentation                             | In GitHub     |

release.md renamed to RELEASE.md

@@ -24,7 +24,7 @@ maintainers = [
     { name="Emily Kellison-Linn", email="[email protected]" }
 ]
 description = "An open-source interactive data visualization library for Python"
-readme = {file = "README.txt", content-type = "text/markdown"}
+readme = {file = "README.md", content-type = "text/markdown"}
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Programming Language :: Python :: 3.8",

_plotly_future_/__init__.py

@@ -7,7 +7,7 @@
 # tested with percy.
 
 # this directory
-dir_name = os.path.join("test", "percy")
+dir_name = os.path.join("tests", "percy")
 
 # #### Scatter and Line plots