icplot 0.3.5__tar.gz → 0.5.0__tar.gz

icplot-0.5.0/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Irish Centre for High End Computing
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

icplot-0.5.0/PKG-INFO

@@ -0,0 +1,172 @@
+Metadata-Version: 2.4
+Name: icplot
+Version: 0.5.0
+Summary: Utilities for generating plots and graphics for technical reports.
+Author: Irish Centre for High End Computing
+License: MIT
+Project-URL: Repository, https://git.ichec.ie/platform-engineering/modules/documentation/ichec-plot
+Project-URL: Homepage, https://git.ichec.ie/platform-engineering/modules/documentation/ichec-plot
+Keywords: Publishing,Technical Reports,Graphics
+Classifier: Development Status :: 3 - Alpha
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: System :: Distributed Computing
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: iccore==0.2.3
+Requires-Dist: graphviz
+Requires-Dist: Jinja2
+Provides-Extra: cairo
+Requires-Dist: CairoSVG; extra == "cairo"
+Provides-Extra: scene
+Requires-Dist: pycairo; extra == "scene"
+Provides-Extra: imagemagick
+Requires-Dist: wand; extra == "imagemagick"
+Provides-Extra: plot
+Requires-Dist: matplotlib; extra == "plot"
+Provides-Extra: vtk
+Requires-Dist: vtk; extra == "vtk"
+Provides-Extra: geometry
+Requires-Dist: scipy; extra == "geometry"
+Provides-Extra: video
+Requires-Dist: moviepy; extra == "video"
+Provides-Extra: all
+Requires-Dist: CairoSVG; extra == "all"
+Requires-Dist: pycairo; extra == "all"
+Requires-Dist: wand; extra == "all"
+Requires-Dist: matplotlib; extra == "all"
+Requires-Dist: vtk; extra == "all"
+Requires-Dist: scipy; extra == "all"
+Requires-Dist: moviepy; extra == "all"
+Dynamic: license-file
+
+# icplot
+
+This is a library used at [The Irish Centre for High End Computing (ICHEC)](https://www.ichec.ie) for generating plots, diagrams and other graphics for technical documents.
+
+# Scope #
+
+The library is **frozen to what its consumers use** — the `ichec-handbook`
+build tool and `ichec-flow`. That means `converter`, `renderer`, `theme` and
+`graph`: fixes and maintenance yes, new capability no (planning#136). The
+`geometry`/`mesh` 3D and OpenFOAM code is still here but is scheduled to move
+to a module of its own, and its optional-dependency weight goes with it.
+
+# Features #
+
+The project has three primary modules:
+
+`converter`: Converts between image formats, such as pdf, svg and png
+`renderer`: Render text based inputs as svg, pdf or png images or videos
+`theme`: Generate and apply themes from a design system
+
+
+## Converter ##
+
+To covert between image formats you can do:
+
+``` shell
+icplot convert --source my_image.svg --target my_image.png
+```
+
+Supported conversions are:
+
+* svg -> png
+* svg -> pdf
+* pdf -> png
+
+## Renderer ##
+
+Render a range of text based formats to images or videos. For example,
+
+``` shell
+icplot render --file uml_diagram.puml
+```
+
+renders the PlantUML file to png and svg. 
+
+Supported render inputs and targets are:
+
+* PlantUml
+  * SVG
+  * PNG
+* Latex/Tikz
+  * PDF
+  * SVG
+  * PNG
+* Mermaid
+  * SVG
+  * PNG
+* Custom JSON 
+  * Graph
+    * Backends:
+      * Matplotlib
+      * VTK
+    * Output formats:
+      * SVG
+      * PNG
+      * MP4
+  * Tree
+    * Backends:
+      * Graphviz
+    * Output formats:
+      * SVG
+      * PNG
+  * Gantt
+    * Backends:
+      * Cairo
+      * PgfGantt
+    * Output formats:
+      * SVG
+      * PNG
+  * Scene
+    * Backends:
+      * Cairo
+      * VTK
+    * Output formats:
+      * SVG
+      * VTK
+      
+## Themes ##
+
+The library supports themeing with an Angular Material 3 motivated design system. Plots can be themed by adapting a version of `theme.json` included in this module's source.  Currently Tikz and PlantUML support themeing.
+  
+# Installation #
+
+The package is available on PyPI. The core install is deliberately light — it
+does not pull the heavy rendering backends, so consumers that only need part of
+the library (e.g. a docs build that just converts svg to png) stay small:
+
+``` shell
+pip install icplot
+```
+
+Backends are opt-in via extras:
+
+| Extra | Pulls | Enables |
+|---|---|---|
+| `cairo` | CairoSVG | svg → png / pdf conversion |
+| `scene` | pycairo | vector scene drawing (`renderer.scene.cairo`) |
+| `imagemagick` | wand | pdf → png conversion (falls back to the `magick` CLI) |
+| `plot` | matplotlib | 2D plotting (`renderer.graph`, `charts`) |
+| `vtk` | vtk | 3D / mesh rendering (`geometry.mesh`) |
+| `geometry` | scipy | geometry transforms (`geometry.operations`) |
+| `video` | moviepy | video assembly (`renderer.video`) |
+| `all` | all of the above | everything (previous default behaviour) |
+
+For example, `pip install icplot[cairo]` for svg conversion, or
+`pip install icplot[all]` for the full toolkit. The native `cairo` and
+`imagemagick` system libraries are also required for those backends; on Mac:
+
+``` shell
+brew install imagemagick cairo
+```
+
+# Copyright #
+
+Copyright 2026 Irish Centre for High End Computing
+
+The software in this repository can be used under the conditions of the MIT license, which is available for reading in the accompanying LICENSE file.
+

{icplot-0.3.5 → icplot-0.5.0}/README.md

@@ -2,6 +2,14 @@
 
 This is a library used at [The Irish Centre for High End Computing (ICHEC)](https://www.ichec.ie) for generating plots, diagrams and other graphics for technical documents.
 
+# Scope #
+
+The library is **frozen to what its consumers use** — the `ichec-handbook`
+build tool and `ichec-flow`. That means `converter`, `renderer`, `theme` and
+`graph`: fixes and maintenance yes, new capability no (planning#136). The
+`geometry`/`mesh` 3D and OpenFOAM code is still here but is scheduled to move
+to a module of its own, and its optional-dependency weight goes with it.
+
 # Features #
 
 The project has three primary modules:
@@ -83,13 +91,30 @@ The library supports themeing with an Angular Material 3 motivated design system
   
 # Installation #
 
-The package is available on PyPI. For a minimal installation you can do:
+The package is available on PyPI. The core install is deliberately light — it
+does not pull the heavy rendering backends, so consumers that only need part of
+the library (e.g. a docs build that just converts svg to png) stay small:
 
 ``` shell
 pip install icplot
 ```
 
-For full functionality, particularly conversion of image formats, `imagemagick` and `cairo` are required. On Mac you can install them with:
+Backends are opt-in via extras:
+
+| Extra | Pulls | Enables |
+|---|---|---|
+| `cairo` | CairoSVG | svg → png / pdf conversion |
+| `scene` | pycairo | vector scene drawing (`renderer.scene.cairo`) |
+| `imagemagick` | wand | pdf → png conversion (falls back to the `magick` CLI) |
+| `plot` | matplotlib | 2D plotting (`renderer.graph`, `charts`) |
+| `vtk` | vtk | 3D / mesh rendering (`geometry.mesh`) |
+| `geometry` | scipy | geometry transforms (`geometry.operations`) |
+| `video` | moviepy | video assembly (`renderer.video`) |
+| `all` | all of the above | everything (previous default behaviour) |
+
+For example, `pip install icplot[cairo]` for svg conversion, or
+`pip install icplot[all]` for the full toolkit. The native `cairo` and
+`imagemagick` system libraries are also required for those backends; on Mac:
 
 ``` shell
 brew install imagemagick cairo
@@ -97,7 +122,7 @@ brew install imagemagick cairo
 
 # Copyright #
 
-Copyright 2024 Irish Centre for High End Computing
+Copyright 2026 Irish Centre for High End Computing
 
-The software in this repository can be used under the conditions of the GPLv3+ license, which is available for reading in the accompanying LICENSE file.
+The software in this repository can be used under the conditions of the MIT license, which is available for reading in the accompanying LICENSE file.
 

icplot-0.5.0/pyproject.toml

@@ -0,0 +1,124 @@
+[project]
+name = "icplot"
+dynamic = ["version"]
+license = { text = "MIT" }
+authors = [
+  { name="Irish Centre for High End Computing"},
+]
+description = "Utilities for generating plots and graphics for technical reports."
+readme = "README.md"
+requires-python = ">=3.10"
+classifiers = [
+    "Development Status :: 3 - Alpha",
+    "Programming Language :: Python :: 3",
+    "License :: OSI Approved :: MIT License",
+    "Operating System :: OS Independent",
+    "Topic :: System :: Distributed Computing"
+]
+keywords = ["Publishing", "Technical Reports", "Graphics"]
+
+# Core is deliberately light: only what every import path needs. The heavy
+# rendering backends (matplotlib/vtk/scipy/moviepy/wand) are optional extras
+# so consumers that only use the converter or diagram renderer (e.g. the
+# handbook build) can install a small footprint. Use icplot[all] for the
+# previous behaviour of pulling every backend.
+dependencies = ["iccore==0.2.3",
+                "graphviz",
+                "Jinja2"]
+
+[project.urls]
+Repository = "https://git.ichec.ie/platform-engineering/modules/documentation/ichec-plot"
+Homepage = "https://git.ichec.ie/platform-engineering/modules/documentation/ichec-plot"
+
+[project.optional-dependencies]
+# svg/pdf conversion (converter.svg_to_png / svg_to_pdf). CairoSVG pulls
+# cairocffi, which dlopens libcairo at runtime (no C build step needed).
+cairo = [
+   "CairoSVG"
+]
+
+# vector scene drawing (renderer.scene.cairo). pycairo (module `cairo`)
+# builds against libcairo — needs the cairo headers + a C toolchain at install.
+scene = ["pycairo"]
+
+# raster conversion via ImageMagick bindings (converter.pdf_to_png);
+# falls back to the `magick` CLI if wand is absent
+imagemagick = ["wand"]
+
+# 2D plotting backend (icplot.renderer.graph / icplot.charts)
+plot = ["matplotlib"]
+
+# 3D / mesh backend (icplot.geometry.mesh, vtk graph backend)
+vtk = ["vtk"]
+
+# geometry transforms (icplot.geometry.operations)
+geometry = ["scipy"]
+
+# video assembly (icplot.renderer.video)
+video = ["moviepy"]
+
+# convenience aggregate — every backend (pre-split behaviour)
+all = [
+   "CairoSVG",
+   "pycairo",
+   "wand",
+   "matplotlib",
+   "vtk",
+   "scipy",
+   "moviepy"
+]
+
+[build-system]
+requires = ["setuptools>=64", "setuptools-scm>=8"]
+build-backend = "setuptools.build_meta"
+
+# Version derived from the git tag (setuptools-scm). fallback_version keeps
+# non-release jobs building on the shallow CI checkout, which has no tags.
+[tool.setuptools_scm]
+fallback_version = "0.0.0"
+
+# Development toolchain (uv-native, PEP 735). CI installs it with
+# `uv sync --group dev`. Deliberately free of the rendering backends: the lint
+# job runs in the standard slim image, and pycairo has no wheel there — it
+# builds against libcairo headers. The test job adds the backends with
+# `--extra all` in an image that has those headers.
+[dependency-groups]
+dev = [
+    "ruff",
+    "mypy",
+    "pytest",
+    "pytest-cov",
+    "pytest-sugar",
+    "types-PyYAML",
+]
+
+[project.scripts]
+icplot = "icplot.main_cli:main_cli"
+
+[tool.setuptools.package-data]
+"icplot" = ["py.typed", "controlDict", "theme/theme.json", "theme/templates/*.j2"]
+
+[tool.setuptools.packages.find]
+where = ["src"]
+
+[tool.mypy]
+ignore_missing_imports = true
+
+[tool.ruff]
+line-length = 88
+target-version = "py310"
+src = ["src", "test"]
+
+[tool.ruff.lint]
+# E/W pycodestyle, F pyflakes, I import-sort (was isort), N pep8-naming,
+# UP pyupgrade, B bugbear. Extend deliberately, not by pulling in "ALL".
+select = ["E", "W", "F", "I", "N", "UP", "B"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["icplot"]
+
+[tool.pytest.ini_options]
+testpaths = ["test",]
+log_cli = 1
+log_cli_level = "debug"
+addopts = "--cov=icplot --cov-report term --cov-fail-under=55 --cov-report xml:coverage.xml --cov-report html"

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/charts/tree.py

@@ -1,9 +1,9 @@
 import logging
 import os
 import shutil
+from collections.abc import Callable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Callable
 
 import graphviz
 

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/converter/image.py

@@ -45,19 +45,24 @@ def _get_out_filename(source: Path, target: Path | None, extension: str) -> Path
     return source.parent / f"{source.stem}.{extension}"
 
 
-# The order of ImageMagick arguments was changed so that `-alpha off`
-# is applied after loading the source file rather than before.
-# This ensures proper handling when converting PDFs/SVGs,
-# as some versions of ImageMagick ignore or misapply `-alpha off` if it
-# appears before the input file.
+# `-alpha off` must come *after* the source file: some ImageMagick versions
+# ignore or misapply it when it precedes the input.
 def _pdf_to_png(source: Path, target: Path | None = None, resolution: int = 300):
 
     outfile = _get_out_filename(source, target, "png")
     os.makedirs(outfile.parent, exist_ok=True)
-    cmd = (
-        f"magick -density {resolution} -background white {source} -alpha off {outfile}"
-    )
-    subprocess.run(cmd, shell=True, check=True)
+    cmd = [
+        "magick",
+        "-density",
+        str(resolution),
+        "-background",
+        "white",
+        str(source),
+        "-alpha",
+        "off",
+        str(outfile),
+    ]
+    subprocess.run(cmd, check=True)
 
 
 def pdf_to_png(source: Path, target: Path | None = None, resolution: int = 300):

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/mesh/mesh.py

@@ -27,7 +27,6 @@ class Patch:
 
 @dataclass(frozen=True)
 class Mesh:
-
     vertices: tuple[Vertex, ...]
     cells: tuple[Cell, ...]
     scale: float = 1.0

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/mesh/openfoam/blockmesh.py

@@ -125,8 +125,7 @@ def generate_mesh(mesh: Mesh, case_dir: Path):
     if not control_dict.exists():
         shutil.copy(Path(__file__).parent / "controlDict", control_dict)
 
-    cmd = f"blockMesh -case {case_dir}"
-    subprocess.run(cmd, cwd=case_dir, shell=True, check=True)
+    cmd = ["blockMesh", "-case", str(case_dir)]
+    subprocess.run(cmd, cwd=case_dir, check=True)
 
-    cmd = f"blockMesh -case {case_dir} -write-vtk"
-    subprocess.run(cmd, cwd=case_dir, shell=True, check=True)
+    subprocess.run(cmd + ["-write-vtk"], cwd=case_dir, check=True)

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/mesh/openfoam/foamfile.py

@@ -114,5 +114,5 @@ def parse(content: str) -> FoamFile:
 
 def read_foamfile(path: Path) -> FoamFile:
 
-    with open(path, "r", encoding="utf-8") as f:
+    with open(path, encoding="utf-8") as f:
         return parse(f.read())

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/mesh/openfoam/polymesh.py

@@ -53,7 +53,10 @@ class Polymesh:
 class PolymeshPatch:
     name: str
     faces: tuple[Face, ...]
-    startFace: int
+    # Mirrors the field name in OpenFOAM's own polyMesh/boundary file, which
+    # this class both parses and writes back out — renaming it to snake_case
+    # would put the Python attribute out of step with the format on disk.
+    startFace: int  # noqa: N815
     type: str = "patch"
 
     def has_face(self, face: Face) -> bool:

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/mesh/shapes.py

@@ -102,7 +102,6 @@ def _close_circle(inner_mesh: Mesh, outer_mesh: Mesh, num_circumferential: int)
     new_cells = []
     count = 0
     for idx in range(num_circumferential):
-
         next_id = idx + 1
         if next_id == num_circumferential:
             next_id = 0
@@ -317,7 +316,6 @@ def mesh_cuboids(
     for cuboid in cuboids:
         vert_ids = []
         for p in cuboid.points:
-
             if not verts:
                 verts.append(Vertex.from_point(p, 0))
                 vert_ids.append(0)

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/mesh/vertex.py

@@ -57,7 +57,6 @@ def find_closest(verts: list[Vertex], point: Point) -> int:
     min_id = -1
     min_distance = 0.0
     for idx, v in enumerate(verts):
-
         distance = v.get_distance(point)
 
         if idx == 0:
@@ -80,7 +79,6 @@ def find_closest_vertex(verts: tuple[Vertex, ...], v: Vertex) -> Vertex:
     min_id = -1
     min_distance = 0.0
     for idx, vert in enumerate(verts):
-
         distance = vert.get_vertex_distance(v)
 
         if idx == 0:

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/geometry/shapes.py

@@ -26,13 +26,11 @@ class Shape:
 
 @dataclass(frozen=True)
 class Circle(Shape):
-
     radius: float = 1.0
 
 
 @dataclass(frozen=True)
 class Annulus(Shape):
-
     outer_radius: float = 1.0
     inner_radius: float = 0.5
     angle: float = 360  # degrees

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/graph/plot_group.py

@@ -42,7 +42,6 @@ class LineConfig:
 
 
 class PlotGroupBase(BaseModel, frozen=True):
-
     start_datetime: datetime | None = None
     end_datetime: datetime | None = None
     video: VideoConfig | None = None

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/graph/series.py

@@ -16,13 +16,11 @@ from icplot.theme.color import Color
 
 
 class PlotSeriesBase(BaseModel, frozen=True):
-
     min_value: float | None = None
     max_value: float | None = None
 
 
 class PlotSeriesCreate(PlotSeriesBase, frozen=True):
-
     measurement: str
     unit_name: str = ""
 
@@ -36,7 +34,6 @@ class PlotSeriesCreate(PlotSeriesBase, frozen=True):
 
 
 class PlotSeriesPublic(PlotSeriesBase, frozen=True):
-
     measurement: MeasurementPublicWithUnits
     unit: UnitPublic
     x: MeasurementPublicWithUnits | None

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/renderer/charts/pgfgantt.py

@@ -40,7 +40,7 @@ def _ganttbar(milestone) -> str:
 
 def render(gantt: GanttChart, theme: "Theme | None" = None) -> str:
 
-    with open(Path(__file__).parent / "pgfgantt.tex", "r", encoding="utf-8") as f:
+    with open(Path(__file__).parent / "pgfgantt.tex", encoding="utf-8") as f:
         template = f.read()
 
     milestones = gantt.milestones

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/renderer/formats/mermaid.py

@@ -6,6 +6,7 @@ Mermaid must already be set up on the system, eg. via the npm ecosystem.
 
 import logging
 import os
+import shlex
 import shutil
 import subprocess
 from pathlib import Path
@@ -39,9 +40,9 @@ def render(ctx: RenderContext):
     if not browser_config and (env_path := os.environ.get("MMDC_PUPPETEER_CONFIG")):
         browser_config = Path(env_path)
 
-    cmd = f"mmdc -i '{ctx.source}' -o '{output_path}'"
+    cmd = ["mmdc", "-i", str(ctx.source), "-o", str(output_path)]
     if browser_config:
-        cmd += f" -p '{browser_config}'"
-    logger.debug("Command: %s", cmd)
-    subprocess.run(cmd, shell=True, check=True)
+        cmd += ["-p", str(browser_config)]
+    logger.debug("Command: %s", shlex.join(cmd))
+    subprocess.run(cmd, check=True)
     logger.info("Done: %s", output_path.name)

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/renderer/formats/tex.py

@@ -5,6 +5,7 @@ This module has functionality for publishing Tex documents
 import hashlib
 import logging
 import os
+import shlex
 import shutil
 import subprocess
 from pathlib import Path
@@ -38,12 +39,11 @@ def _run_commands(ctx: RenderContext, work_dir: Path):
     logger.debug("Engine: %s | work_dir: %s", ctx.config.tex.build_engine, work_dir)
 
     if ctx.config.tex.build_engine == "pdflatex":
-        cmd = f"{ctx.config.tex.build_engine} {' '.join(extra_flags)} '{ctx.source}'"
-        logger.info("Command: %s", cmd.strip())
+        cmd = [ctx.config.tex.build_engine, *extra_flags, str(ctx.source)]
+        logger.info("Command: %s", shlex.join(cmd))
         with open(work_dir / "stdout.txt", "w", encoding="utf-8") as f:
             subprocess.run(
                 cmd,
-                shell=True,
                 check=True,
                 cwd=work_dir,
                 env=tex_env,
@@ -91,7 +91,10 @@ def render(ctx: RenderContext):
         ctx.config.tex.build_engine,
     )
 
-    path_hash = hashlib.md5(str(ctx.source).encode()).hexdigest()[:8]
+    # Names a build directory, so collision resistance is all that is wanted.
+    path_hash = hashlib.md5(
+        str(ctx.source).encode(), usedforsecurity=False
+    ).hexdigest()[:8]
     work_dir = ctx.build_dir / f"{ctx.source.stem}_{path_hash}"
     work_dir.mkdir(exist_ok=True, parents=True)
 

{icplot-0.3.5 → icplot-0.5.0}/src/icplot/renderer/graph/matplotlib.py

@@ -2,9 +2,9 @@ import logging
 from pathlib import Path
 from typing import cast
 
-from icplot.graph.series import LinePlotSeries  # NOQA
 from icplot.graph.series import (
     ImageSeries,
+    LinePlotSeries,  # NOQA
     PlotSeries,
     ScatterPlotSeries,
 )
@@ -33,6 +33,11 @@ class MatplotlibColorMap(ColorMap):
         super().__init__(label, mpl.colormaps[label])
 
 
+# Module-level singleton rather than a constructed default argument, which
+# would be built once at import time and shared silently across every call.
+_DEFAULT_COLORMAP = MatplotlibColorMap("gist_rainbow")
+
+
 def str_exact_values_formatter(x, pos):
     """
     When using log scale, axis ticks come out as scientific notation by default,
@@ -158,9 +163,10 @@ def _render(fig, path: Path | None = None):
         plt.switch_backend("Agg")
 
 
-def render(
-    plot: Plot, path: Path | None = None, cmap=MatplotlibColorMap("gist_rainbow")
-):
+def render(plot: Plot, path: Path | None = None, cmap=None):
+
+    if cmap is None:
+        cmap = _DEFAULT_COLORMAP
 
     colors = get_series_colors(cmap, plot)
 
@@ -169,7 +175,8 @@ def render(
     if len(plot.y_axes) > 1:
         axs.append(ax.twinx())
 
-    for series, color in zip(plot.series, colors):
+    # colors is derived from plot.series, so the two are the same length.
+    for series, color in zip(plot.series, colors, strict=True):
         _plot_series(axs, series, color)
 
     _set_decorations(axs, plot)
@@ -185,7 +192,9 @@ def render_grid(
     rows, cols, series = plot.get_subplots(num_samples)
     fig, axs = plt.subplots(rows, cols)
 
-    for ax, series_item in zip(axs, series):
+    # strict=False keeps the existing behaviour: plt.subplots(rows, cols) can
+    # return more axes than there are series when the grid is not full.
+    for ax, series_item in zip(axs, series, strict=False):
         _plot_series(ax, series_item)
 
     _render(fig, path)