Merge branch 'main' into feature-5362

Author: camdecoster

CHANGELOG.md

@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Fix issue where user-specified `color_continuous_scale` was ignored when template had `autocolorscale=True` [[#5439](https://github.com/plotly/plotly.py/pull/5439)], with thanks to @antonymilne for the contribution!
 - Use presence of `COLAB_NOTEBOOK_ID` env var to enable Colab renderer instead of testing import of `google.colab` [[#5473](https://github.com/plotly/plotly.py/pull/5473)], with thanks to @kevineger for the contribution!
 - Update tests to be compatible with numpy 2.4 [[#5522](https://github.com/plotly/plotly.py/pull/5522)], with thanks to @thunze for the contribution!
+- Add default headers to be passed in to Kaleido v1.3.0 to avoid blocked Open Street Map tiles [#5588](https://github.com/plotly/plotly.py/pull/5588)]
 
 ### Updated
 - The `__eq__` method for  `graph_objects` classes now returns `NotImplemented` to give the other operand an opportunity to handle the comparison [[#5547](https://github.com/plotly/plotly.py/pull/5547)], with thanks to @RazerM for the contribution!

RELEASE.md

@@ -110,9 +110,9 @@ Once these are verified working, you can move on to publishing the release.
 
 ### Publishing to PyPI
 
-The final step is to publish the release to PyPI. **You will need special permissions from Plotly leadership to do this.**.
+The final step is to publish the release to PyPI. **You will need special permissions from Plotly leadership to do this.**
 
-You must install first install [Twine](https://pypi.org/project/twine/) (`pip install twine`) if not already installed.
+You must first install [Twine](https://pypi.org/project/twine/) (`pip install twine`) if not already installed.
 
 Publishing to PyPI:
 ```bash
@@ -132,10 +132,21 @@ Your account must have permissions to publish to the `plotly` project on PyPI.
 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`
+    1. bump the version of plotly.py in `_data/pyversion.json`
     2. bump the version of plotly.js with `cd _data && python get_plotschema.py <PLOTLY.JS VERSION>` fixing any errors that come up.
-      - If plotly.js contains any new traces or trace or layout attributes, you'll get a warning `“missing key in attributes: <attribute-name>`. To resolve, add the attribute to the relevant section in `/_data/orderings.json` in the position you want it to appear in the reference docs.
-    3. rebuild the Algolia `schema` index with `ALGOLIA_API_KEY=<key> make update_ref_search`
+
+       **About `_data/orderings.json`:** `get_plotschema.py` downloads the raw `plot-schema.json` from the specified plotly.js release and uses `_data/orderings.json` (which lives in `graphing-library-docs`, not plotly.js) to determine the order in which traces, trace attributes, and layout attributes appear in the [reference documentation](https://plotly.com/python/reference/). The file has three sections:
+       - `layout` — top-level layout attributes (e.g. `hovermode`, `clickmode`, `xaxis`)
+       - `traces` — order of trace types (e.g. `scatter`, `bar`, `pie`)
+       - `trace_attr_order` — order of attributes shared across traces
+
+       If plotly.js adds new traces or trace/layout attributes that aren't listed in `orderings.json`, `get_plotschema.py` prints a warning like `missing key in attributes: <attribute-name>` and appends the missing entry to the end of its section. To resolve:
+
+       - Add each missing attribute to the appropriate section of `/_data/orderings.json` in the position you want it to appear in the reference docs.
+       - When in doubt about trace-attribute placement, match plotly.js's native order: open the regenerated `_data/plotschema.json` and find where plotly.js itself places the attribute (e.g. inspect a representative trace's `attributes` keys in order). Following the native order keeps related attributes grouped (for example, `texttemplate` → `texttemplatefallback` → `texttemplatesrc`).
+       - For new top-level layout attributes, group them with semantically related entries rather than appending to the end (for example, a new click-behavior attribute like `clickanywhere` belongs next to `clickmode`).
+       - Re-run `python get_plotschema.py <PLOTLY.JS VERSION>` after editing `orderings.json` and confirm the warnings are gone.
+    3. Rebuild the Algolia `schema` index with `ALGOLIA_API_KEY=<key> make update_ref_search`
     4. Rebuild the Algolia `python` index with `ALGOLIA_API_KEY=<key> make update_python_search`
     5. Commit and push the changes to `master` in that repo
 
@@ -158,5 +169,5 @@ PyPI RC (no special flags, just the `rc1` suffix):
 (plotly_dev) $ twine upload dist/plotly-X.Y.Zrc1*
 ```
 
-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.
+The `rc1` suffix ensures that users won't install this version by default —
+they must explicitly request it (e.g., `pip install plotly==X.Y.Zrc1`).

commands.py

@@ -149,34 +149,20 @@ def overwrite_plotlyjs_version_file(plotlyjs_version):
         )
 
 
-def request_json(url):
-    """Get JSON data from a URL."""
+def get_latest_commit_info(repo, branch):
+    """Get latest commit info from GitHub API."""
 
+    url = "https://api.github.com/repos/{repo}/commits/{branch}".format(
+        repo=repo, branch=branch
+    )
     req = requests.get(url)
-    return json.loads(req.content.decode("utf-8"))
-
-
-def get_latest_publish_build_info(repo, branch):
-    """Get build info from Circle CI."""
-
-    url = (
-        r"https://circleci.com/api/v1.1/project/github/"
-        r"{repo}/tree/{branch}?limit=100&filter=completed"
-    ).format(repo=repo, branch=branch)
-
-    branch_jobs = request_json(url)
-
-    # Get most recent successful publish build for branch
-    builds = [
-        j
-        for j in branch_jobs
-        if j.get("workflows", {}).get("job_name", None) == "publish-dist"
-        and j.get("status", None) == "success"
-    ]
-    build = builds[0]
+    assert req.status_code == 200, "Failed to fetch commit info: %s" % req.text
+    commit = req.json()
 
-    # Extract build info
-    return {p: build[p] for p in ["vcs_revision", "build_num", "committer_date"]}
+    return {
+        "vcs_revision": commit["sha"],
+        "committer_date": commit["commit"]["committer"]["date"],
+    }
 
 
 def get_bundle_schema_local(local):
@@ -188,29 +174,15 @@ def get_bundle_schema_local(local):
     return plotly_archive, plotly_bundle, plotly_schemas
 
 
-def get_bundle_schema_urls(build_num):
-    """Get URLs for required files."""
-
-    url = (
-        "https://circleci.com/api/v1.1/project/github/"
-        "plotly/plotly.js/{build_num}/artifacts"
-    ).format(build_num=build_num)
-
-    artifacts = request_json(url)
-
-    # Find archive
-    archives = [a for a in artifacts if a.get("path", None) == "plotly.js.tgz"]
-    archive = archives[0]
-
-    # Find bundle
-    bundles = [a for a in artifacts if a.get("path", None) == "dist/plotly.min.js"]
-    bundle = bundles[0]
+def get_github_urls(repo, revision):
+    """Get URLs for required files from GitHub."""
 
-    # Find schema
-    schemas = [a for a in artifacts if a.get("path", None) == "dist/plot-schema.json"]
-    schema = schemas[0]
+    raw = f"https://raw.githubusercontent.com/{repo}/{revision}"
+    archive_url = f"https://github.com/{repo}/tarball/{revision}"
+    bundle_url = raw + "/dist/plotly.min.js"
+    schema_url = raw + "/dist/plot-schema.json"
 
-    return archive["url"], bundle["url"], schema["url"]
+    return archive_url, bundle_url, schema_url
 
 
 def update_schema(plotly_js_version):
@@ -249,9 +221,9 @@ def update_plotlyjs(plotly_js_version, outdir):
 def update_schema_bundle_from_master(args):
     """Update the plotly.js schema and bundle from master."""
     if args.local is None:
-        build_info = get_latest_publish_build_info(args.devrepo, args.devbranch)
-        archive_url, bundle_url, schema_url = get_bundle_schema_urls(
-            build_info["build_num"]
+        build_info = get_latest_commit_info(args.devrepo, args.devbranch)
+        archive_url, bundle_url, schema_url = get_github_urls(
+            args.devrepo, build_info["vcs_revision"]
         )
 
         # Update bundle in package data

dependabot.yml

@@ -0,0 +1,9 @@
+version: 2
+
+updates:
+  - package-ecosystem: "uv"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 3  # Should match tool.uv.exclude-newer option in pyproject.toml