Merge branch 'main' into secondary-y-shared

Author: gmjw

CHANGELOG.md

@@ -2,8 +2,16 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## Unreleased
+## [6.2.0] - 2025-06-26
 
+### Added
+- Add SRI (Subresource Integrity) hash support for CDN script tags when using `include_plotlyjs='cdn'`. This enhances security by ensuring browser verification of CDN-served plotly.js files [[#5165](https://github.com/plotly/plotly.py/pull/5165)] (with thanks to @ddworken)
+
+### Fixed
+- Allow setting Plotly.js path via `pio.defaults` [[#5207](https://github.com/plotly/plotly.py/pull/5207)]
+
+### Changed
+- Refactor validation code to reduce bundle size [[#5214](https://github.com/plotly/plotly.py/pull/5214)] (with thanks to @bmaranville)
 - Add deprecation warnings when using Kaleido v0 or deprecated image export features [[#5177](https://github.com/plotly/plotly.py/pull/5236)]
 
 ## [6.1.2] - 2025-05-27
@@ -24,9 +32,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Add support for Kaleido>=v1.0.0 for image generation [[#5062](https://github.com/plotly/plotly.py/pull/5062), [#5177](https://github.com/plotly/plotly.py/pull/5177)]
 - Reduce package bundle size by 18-24% via changes to code generation [[#4978](https://github.com/plotly/plotly.py/pull/4978)]
 
-### Added
-- Add SRI (Subresource Integrity) hash support for CDN script tags when using `include_plotlyjs='cdn'`. This enhances security by ensuring browser verification of CDN-served plotly.js files [[#PENDING](https://github.com/plotly/plotly.py/pull/PENDING)]
-
 ### Fixed
 - Fix third-party widget display issues in v6 [[#5102](https://github.com/plotly/plotly.py/pull/5102)]
 - Add handling for case where `jupyterlab` or `notebook` is not installed [[#5104](https://github.com/plotly/plotly.py/pull/5104/files)]

doc/apidoc/conf.py

@@ -24,7 +24,7 @@
 # The short X.Y version
 version = ""
 # The full version, including alpha/beta/rc tags
-release = "6.0.1"
+release = "6.2.0"
 
 
 # -- General configuration ---------------------------------------------------

doc/python/static-image-export.md

@@ -269,7 +269,7 @@ The following settings are available.
 
 `default_scale`: The default image scale factor applied on image export.
 
-`default_format`: The default image format used on export. One of "png", "jpeg", "webp", "svg", or "pdf". ("eps" support is deprecated and available with Kaleido v0 only)
+`default_format`: The default image format used on export. One of "png", "jpeg", "webp", "svg", or "pdf". ("eps" support is available with Kaleido v0 only)
 
 `mathjax`: Location of the MathJax bundle needed to render LaTeX characters. Defaults to a CDN location. If fully offline export is required, set this to a local MathJax bundle.
 

doc/requirements.txt

@@ -1,4 +1,4 @@
-plotly==6.0.1
+plotly==6.2.0
 anywidget
 cufflinks==0.17.3
 dash-bio

plotly/basedatatypes.py

@@ -3404,8 +3404,8 @@ def show(self, *args, **kwargs):
             plot is. The default is set in plotly.js.
 
         height: int or float
-            An integer or float that determines the number of pixels wide the
-            plot is. The default is set in plotly.js.
+            An integer or float specifying the height of the plot in pixels.
+            The default is set in plotly.js.
 
         config: dict
             A dict of parameters to configure the figure. The defaults are set

plotly/io/__init__.py

@@ -17,7 +17,7 @@
     from ._html import to_html, write_html
     from ._renderers import renderers, show
     from . import base_renderers
-    from ._kaleido import defaults
+    from ._kaleido import defaults, get_chrome
 
     __all__ = [
         "to_image",
@@ -38,6 +38,7 @@
         "base_renderers",
         "full_figure_for_development",
         "defaults",
+        "get_chrome",
     ]
 else:
     __all__, __getattr__, __dir__ = relative_import(
@@ -59,6 +60,7 @@
             "._renderers.renderers",
             "._renderers.show",
             "._kaleido.defaults",
+            "._kaleido.get_chrome",
         ],
     )
 

plotly/io/_kaleido.py

@@ -775,11 +775,13 @@ def full_figure_for_development(
         return go.Figure(fig, skip_invalid=True)
 
 
-def get_chrome() -> None:
+def plotly_get_chrome() -> None:
     """
     Install Google Chrome for Kaleido (Required for Plotly image export).
-    This function can be run from the command line using the command `plotly_get_chrome`
-    defined in pyproject.toml
+    This function is a command-line wrapper for `plotly.io.get_chrome()`.
+
+    When running from the command line, use the command `plotly_get_chrome`;
+    when calling from Python code, use `plotly.io.get_chrome()`.
     """
 
     usage = """
@@ -813,16 +815,60 @@ def get_chrome() -> None:
 
     # Handle "--path" flag
     chrome_install_path = None
-    user_specified_path = False
     if "--path" in cli_args:
         path_index = cli_args.index("--path") + 1
         if path_index < len(cli_args):
             chrome_install_path = cli_args[path_index]
             cli_args.remove("--path")
             cli_args.remove(chrome_install_path)
             chrome_install_path = Path(chrome_install_path)
-            user_specified_path = True
+
+    # If any arguments remain, command syntax was incorrect -- print usage and exit
+    if len(cli_args) > 1:
+        print(usage)
+        sys.exit(1)
+
+    if not cli_yes:
+        print(
+            f"""
+Plotly will install a copy of Google Chrome to be used for generating static images of plots.
+Chrome will be installed at: {chrome_install_path}"""
+        )
+        response = input("Do you want to proceed? [y/n] ")
+        if not response or response[0].lower() != "y":
+            print("Cancelled")
+            return
+    print("Installing Chrome for Plotly...")
+    exe_path = get_chrome(chrome_install_path)
+    print("Chrome installed successfully.")
+    print(f"The Chrome executable is now located at: {exe_path}")
+
+
+def get_chrome(path: Union[str, Path, None] = None) -> Path:
+    """
+    Get the path to the Chrome executable for Kaleido.
+    This function is used by the `plotly_get_chrome` command line utility.
+
+    Parameters
+    ----------
+    path: str or Path or None
+        The path to the directory where Chrome should be installed.
+        If None, the default download path will be used.
+    """
+    if not kaleido_available() or kaleido_major() < 1:
+        raise ValueError(
+            """
+This command requires Kaleido v1.0.0 or greater.
+Install it using `pip install 'kaleido>=1.0.0'` or `pip install 'plotly[kaleido]'`."
+"""
+        )
+
+    # Use default download path if no path was specified
+    if path:
+        user_specified_path = True
+        chrome_install_path = Path(path)  # Ensure it's a Path object
     else:
+        user_specified_path = False
         from choreographer.cli.defaults import default_download_path
 
         chrome_install_path = default_download_path
@@ -848,25 +894,7 @@ def get_chrome() -> None:
 """
             )
 
-    # If any arguments remain, command syntax was incorrect -- print usage and exit
-    if len(cli_args) > 1:
-        print(usage)
-        sys.exit(1)
-
-    if not cli_yes:
-        print(
-            f"""
-Plotly will install a copy of Google Chrome to be used for generating static images of plots.
-Chrome will be installed at: {chrome_install_path}"""
-        )
-        response = input("Do you want to proceed? [y/n] ")
-        if not response or response[0].lower() != "y":
-            print("Cancelled")
-            return
-    print("Installing Chrome for Plotly...")
-    exe_path = kaleido.get_chrome_sync(path=chrome_install_path)
-    print("Chrome installed successfully.")
-    print(f"The Chrome executable is now located at: {exe_path}")
+    return kaleido.get_chrome_sync(path=chrome_install_path)
 
 
 __all__ = ["to_image", "write_image", "scope", "full_figure_for_development"]

pyproject.toml

@@ -32,7 +32,7 @@ classifiers = [
 ]
 requires-python = ">=3.8"
 license = {file="LICENSE.txt"}
-version = "6.1.2"
+version = "6.2.0"
 dependencies = [
     "narwhals>=1.15.1",
     "packaging"
@@ -83,7 +83,7 @@ dev = [
 ]
 
 [project.scripts]
-plotly_get_chrome = "plotly.io._kaleido:get_chrome"
+plotly_get_chrome = "plotly.io._kaleido:plotly_get_chrome"
 
 [tool.pytest.ini_options]
 markers = [

tests/test_io/test_to_from_plotly_json.py

@@ -109,7 +109,7 @@ def numpy_unicode_array(request):
     params=[
         datetime.datetime(2003, 7, 12, 8, 34, 22),
         datetime.datetime.now(),
-        np.datetime64(datetime.datetime.utcnow()),
+        np.datetime64(datetime.datetime.now(datetime.timezone.utc)),
         pd.Timestamp(datetime.datetime.now()),
         eastern.localize(datetime.datetime(2003, 7, 12, 8, 34, 22)),
         eastern.localize(datetime.datetime.now()),

tests/test_optional/test_kaleido/test_kaleido.py

@@ -293,3 +293,24 @@ def test_fig_to_image():
         mock_calc_fig.assert_called_once()
         args, _ = mock_calc_fig.call_args
         assert args[0] == test_fig.to_dict()
+
+
+def test_get_chrome():
+    """Test that plotly.io.get_chrome() can be called."""
+
+    if not kaleido_available() or kaleido_major() < 1:
+        # Test that ValueError is raised when Kaleido requirements aren't met
+        with pytest.raises(
+            ValueError, match="This command requires Kaleido v1.0.0 or greater"
+        ):
+            pio.get_chrome()
+    else:
+        # Test normal operation when Kaleido v1+ is available
+        with patch(
+            "plotly.io._kaleido.kaleido.get_chrome_sync",
+            return_value="/mock/path/to/chrome",
+        ) as mock_get_chrome:
+            pio.get_chrome()
+
+            # Verify that kaleido.get_chrome_sync was called
+            mock_get_chrome.assert_called_once()