icplot 0.4.0__tar.gz → 0.6.0__tar.gz

icplot-0.6.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.4.0/src/icplot.egg-info → icplot-0.6.0}/PKG-INFO

@@ -1,14 +1,15 @@
 Metadata-Version: 2.4
 Name: icplot
-Version: 0.4.0
+Version: 0.6.0
 Summary: Utilities for generating plots and graphics for technical reports.
-Author-email: "James Grogan, Irish Centre for High End Computing" <james.grogan@ichec.ie>
-Project-URL: Repository, https://git.ichec.ie/performance/toolshed/icplot
-Project-URL: Homepage, https://git.ichec.ie/performance/toolshed/icplot
+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 :: GNU General Public License v3 or later (GPLv3+)
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: System :: Distributed Computing
 Requires-Python: >=3.10
@@ -17,37 +18,18 @@ License-File: LICENSE
 Requires-Dist: iccore==0.2.3
 Requires-Dist: graphviz
 Requires-Dist: Jinja2
-Provides-Extra: test
-Requires-Dist: pytest; extra == "test"
-Requires-Dist: pytest-cov; extra == "test"
-Requires-Dist: pytest-sugar; extra == "test"
-Requires-Dist: black; extra == "test"
-Requires-Dist: isort; extra == "test"
-Requires-Dist: mypy; extra == "test"
-Requires-Dist: flake8; extra == "test"
-Requires-Dist: pylint; extra == "test"
-Requires-Dist: types-PyYAML; extra == "test"
 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
 
@@ -55,6 +37,17 @@ Dynamic: license-file
 
 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.
+
+The `geometry`/`mesh` 3D and OpenFOAM code has moved to
+[icmesh](https://git.ichec.ie/platform-engineering/modules/ichec-mesh), taking
+VTK and scipy with it — including VTK plot output, which is now
+`icmesh.plot`. Install `icmesh` if you want it.
+
 # Features #
 
 The project has three primary modules:
@@ -104,7 +97,6 @@ Supported render inputs and targets are:
   * Graph
     * Backends:
       * Matplotlib
-      * VTK
     * Output formats:
       * SVG
       * PNG
@@ -125,10 +117,8 @@ Supported render inputs and targets are:
   * Scene
     * Backends:
       * Cairo
-      * VTK
     * Output formats:
       * SVG
-      * VTK
       
 ## Themes ##
 
@@ -148,14 +138,11 @@ Backends are opt-in via extras:
 
 | Extra | Pulls | Enables |
 |---|---|---|
-| `cairo` | CairoSVG | svg → png / pdf conversion |
-| `scene` | pycairo | vector scene drawing (`renderer.scene.cairo`) |
+| `cairo` | CairoSVG | svg → png / pdf conversion, and vector scene drawing |
 | `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) |
+| `all` | all of the above | everything |
 
 For example, `pip install icplot[cairo]` for svg conversion, or
 `pip install icplot[all]` for the full toolkit. The native `cairo` and
@@ -167,7 +154,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.4.0 → icplot-0.6.0}/README.md

@@ -2,6 +2,17 @@
 
 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.
+
+The `geometry`/`mesh` 3D and OpenFOAM code has moved to
+[icmesh](https://git.ichec.ie/platform-engineering/modules/ichec-mesh), taking
+VTK and scipy with it — including VTK plot output, which is now
+`icmesh.plot`. Install `icmesh` if you want it.
+
 # Features #
 
 The project has three primary modules:
@@ -51,7 +62,6 @@ Supported render inputs and targets are:
   * Graph
     * Backends:
       * Matplotlib
-      * VTK
     * Output formats:
       * SVG
       * PNG
@@ -72,10 +82,8 @@ Supported render inputs and targets are:
   * Scene
     * Backends:
       * Cairo
-      * VTK
     * Output formats:
       * SVG
-      * VTK
       
 ## Themes ##
 
@@ -95,14 +103,11 @@ Backends are opt-in via extras:
 
 | Extra | Pulls | Enables |
 |---|---|---|
-| `cairo` | CairoSVG | svg → png / pdf conversion |
-| `scene` | pycairo | vector scene drawing (`renderer.scene.cairo`) |
+| `cairo` | CairoSVG | svg → png / pdf conversion, and vector scene drawing |
 | `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) |
+| `all` | all of the above | everything |
 
 For example, `pip install icplot[cairo]` for svg conversion, or
 `pip install icplot[all]` for the full toolkit. The native `cairo` and
@@ -114,7 +119,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.6.0/pyproject.toml

@@ -0,0 +1,110 @@
+[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/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) and vector scene
+# drawing (renderer.scene.cairo). CairoSVG pulls cairocffi, which dlopens
+# libcairo at runtime — no C build step, and one cairo binding rather than two.
+cairo = ["CairoSVG"]
+
+# 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"]
+
+# video assembly (renderer.video, driven from renderer.graph.mpl)
+video = ["moviepy"]
+
+# convenience aggregate — every backend
+all = [
+   "CairoSVG",
+   "wand",
+   "matplotlib",
+   "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", "utils"]
+
+[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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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.4.0 → icplot-0.6.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)

{icplot-0.4.0 → icplot-0.6.0}/src/icplot/renderer/graph/mpl.py

@@ -151,7 +151,9 @@ def plot_array(path: Path, series: PlotSeriesPublic, data_series: Series):
         raise RuntimeError("Attempted to plot series with missing data")
 
     for idx, (x, values) in enumerate(
-        zip(data_series.get_array(data_series.x).data, array.data)
+        # strict=False preserves the existing zip-to-shortest behaviour; the
+        # x array and the measurement array are not guaranteed equal length.
+        zip(data_series.get_array(data_series.x).data, array.data, strict=False)
     ):
         fig, ax = plt.subplots()
 

{icplot-0.4.0 → icplot-0.6.0}/src/icplot/renderer/graph/renderer.py

@@ -1,6 +1,8 @@
+import logging
 import os
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable
+from typing import Any
 
 from iccore.data import Series
 from iccore.data.series import convert_units
@@ -12,11 +14,12 @@ from icplot.graph.plot_group import PlotGroupPublic, PlotSeriesPublic
 from icplot.graph.series import LinePlotSeries
 from icplot.renderer.graph.matplotlib import render
 
-from . import mpl, vtk
+from . import mpl
 
+logger = logging.getLogger(__name__)
 
-class PlotConfig(BaseModel, frozen=True):
 
+class PlotConfig(BaseModel, frozen=True):
     series_attr: str
     x_attr: str
     plots: dict[str, Plot]
@@ -39,7 +42,6 @@ def make_plots(
     # Each 'y attribute' in the config corresponds to a 'plot' of this
     # attribute's values.
     for y_attr, plot_template in config.plots.items():
-
         series = []
         for label in series_labels:
             # Get results for this series
@@ -55,7 +57,7 @@ def make_plots(
             )
             if not points:
                 continue
-            x, y = [list(xy) for xy in zip(*points)]
+            x, y = [list(xy) for xy in zip(*points, strict=True)]
 
             if label in config.colormap:
                 series.append(
@@ -79,13 +81,18 @@ def plot(
     results: list[Any],
     config: PlotConfig,
     point_func: Callable,
-    output_dir: Path = Path(os.getcwd()),
+    output_dir: Path | None = None,
 ):
     """
     For a given set of results and plot config generate the
     corresponding plots and render them to files.
     """
 
+    # Resolved per call, not once at import: the previous default froze the
+    # working directory at the moment this module was first imported.
+    if output_dir is None:
+        output_dir = Path(os.getcwd())
+
     for p in make_plots(results, config, point_func):
         render(p, output_dir / f"{p.name}.svg")
 
@@ -123,5 +130,6 @@ def plot_series(
     if "mpl" in group.formats:
         mpl.plot(output_path, group, series, converted_data_series)
 
-    if "vtk" in group.formats and data_series.y:
-        vtk.save(output_path, group, series, converted_data_series)
+    if "vtk" in group.formats:
+        # Moved to icmesh.plot — warn rather than silently drop the request.
+        logger.warning("vtk plot output moved to icmesh; skipping %s", output_path)

{icplot-0.4.0 → icplot-0.6.0}/src/icplot/renderer/render.py

@@ -114,7 +114,6 @@ def _setup_tasks(
 
     tasks = []
     for f in sources:
-
         ext = _get_extension(f)
 
         output_formats = (

{icplot-0.4.0 → icplot-0.6.0}/src/icplot/renderer/scene/cairo.py

@@ -1,6 +1,8 @@
 from pathlib import Path
 
-import cairo
+# cairocffi, not pycairo: same drawing API, but it dlopens libcairo instead of
+# building against its headers, and CairoSVG already pulls it in.
+import cairocffi as cairo
 
 from icplot.scene import Rectangle, Scene
 
@@ -54,6 +56,9 @@ def draw_scene(cr, scene: Scene):
 
 
 def render(scene: Scene, path: Path):
-    with cairo.SVGSurface(path, scene.size[0], scene.size[1]) as surface:
-        cr = cairo.Context(surface)
-        draw_scene(cr, scene)
+    # cairocffi surfaces take a str and are not context managers.
+    surface = cairo.SVGSurface(str(path), scene.size[0], scene.size[1])
+    try:
+        draw_scene(cairo.Context(surface), scene)
+    finally:
+        surface.finish()

{icplot-0.4.0 → icplot-0.6.0}/src/icplot/theme/color.py

@@ -3,7 +3,7 @@ This module handles colors
 """
 
 import re
-from typing import Callable
+from collections.abc import Callable
 
 from pydantic import BaseModel, GetCoreSchemaHandler
 from pydantic_core import core_schema

{icplot-0.4.0 → icplot-0.6.0}/src/icplot/theme/theme_generator.py

@@ -100,6 +100,8 @@ def generate_theme(output_dir: Path, theme_path: Path, template_dir: Path) -> No
 
     env = Environment(
         loader=FileSystemLoader(str(template_dir)),
+        # Targets are PlantUML and TeX, not HTML — escaping would corrupt them.
+        autoescape=False,
         keep_trailing_newline=True,
         trim_blocks=True,
         lstrip_blocks=True,