Merge branch 'plotly:master' into reno

Author: tschm

.github/workflows/publish_testpypi.yml

@@ -88,7 +88,7 @@ jobs:
     runs-on: ubuntu-latest
     environment:
       name: testpypi
-      url: https://test.pypi.org/p/kaleido_test
+      url: https://test.pypi.org/p/kaleido
     # Signs this workflow so pypi trusts it
     permissions:
       id-token: write
@@ -100,7 +100,7 @@ jobs:
         with:
           python-version-file: "./src/py/pyproject.toml"
       - run: git checkout ${{ github.ref_name }}
-      - run: uv sync --no-sources --frozen --all-extras
+      - run: uv sync --frozen --all-extras
       - run: uv build
       - name: Publish package distributions to PyPI
         uses: pypa/gh-action-pypi-publish@release/v1

src/py/CHANGELOG.txt

@@ -1,26 +1,37 @@
+v1.0.0rc14
+- Pass `plotlyjs` option through from Kaleido() to PageGenerator()
+
 v1.0.0rc13
 - Pass mathjax option through when using default plotly.js template
+
 v1.0.0rc12
 - Add `kopts` args to top-level shortcuts to pass args to `Kaleido(**kopts)`
+
 v1.0.0rc11
 - Write mocker tool to parameterize opts in tests
 - Crop page to pdf size
 - Add type checks to user input for improved error messages
 - Fix latex strings in PDF bolding
 - Add some choreographer errors to kaleido.errors
+
 v1.0.0rc10
 - Allow user to pass Figure-like dicts
 - Fix bug by which calc fig rejected plotly figures
 - Improve testing
+
 v1.0.0rc9
 - Fix v1.0.0rc7 for logic reversal (was conditional error)
+
 v1.0.0rc8
 - Add kaleido.calc_fig to return bytes, not write file automatically
 - Add calc_fig[_sync], write_fig_sync, and write_fig_from_object_sync to kaleido API
+
 v1.0.0rc7
 - Use new choreo is_isolated() to improve platform support (snap /tmp sandboxing)
+
 v1.0.0rc6
 - Allow PageGenerator(force_cdn=True) to not use plotly.py's installed js
+
 v1.0.0rc5
 - Fix bug by which plotly.py's internal js was always ignored
 - Adds testing for PageGenerator

src/py/kaleido/kaleido.py

@@ -106,6 +106,7 @@ def __init__(self, *args, **kwargs):  # noqa: D417 no args/kwargs in description
         self._height = kwargs.pop("height", None)
         self._width = kwargs.pop("width", None)
         self._stepper = kwargs.pop("stepper", False)
+        self._plotlyjs = kwargs.pop("plotlyjs", None)
         self._mathjax = kwargs.pop("mathjax", None)
         if not kwargs.get("headless", True) and (self._height or self._width):
             warnings.warn(
@@ -136,7 +137,7 @@ def __init__(self, *args, **kwargs):  # noqa: D417 no args/kwargs in description
             index = self.tmp_dir.path / "index.html"
             self._index = index.as_uri()
             if not page:
-                page = PageGenerator(mathjax=self._mathjax)
+                page = PageGenerator(plotly=self._plotlyjs, mathjax=self._mathjax)
             page.generate_index(index)
 
     async def _conform_tabs(self, tabs=None) -> None: