icplot 0.0.11__tar.gz → 0.0.13__tar.gz

{icplot-0.0.11/src/icplot.egg-info → icplot-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icplot
-Version: 0.0.11
+Version: 0.0.13
 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
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: wand
 Requires-Dist: matplotlib
-Requires-Dist: iccore==0.1.1
+Requires-Dist: iccore==0.1.5
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

{icplot-0.0.11 → icplot-0.0.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "icplot"
-version = "0.0.11"
+version = "0.0.13"
 authors = [
   { name="James Grogan, Irish Centre for High End Computing", email="james.grogan@ichec.ie" },
 ]
@@ -18,7 +18,7 @@ keywords = ["Publishing", "Technical Reports", "Graphics"]
 
 dependencies = ["wand",
 	       "matplotlib",
-	       "iccore==0.1.1"]
+	       "iccore==0.1.5"]
 
 [project.urls]
 Repository = "https://git.ichec.ie/performance/toolshed/icplot"

icplot-0.0.13/src/icplot/cairo_interface.py

@@ -0,0 +1,59 @@
+from pathlib import Path
+
+import cairo
+
+from .geometry import Scene, Rectangle
+
+
+def draw_rect(cr, rect: Rectangle):
+    x0, y0 = rect.location
+    x1 = rect.w
+    y1 = rect.h
+    cr.move_to(x0, y0)
+    cr.line_to(x1, y0)
+    cr.line_to(x1, y1)
+    cr.line_to(x0, y1)
+    cr.close_path()
+
+
+def draw_shape(cr, shape):
+    cr.save()
+    if shape.shape_type == "rect":
+        draw_rect(cr, shape)
+    else:
+        return
+    cr.set_source_rgba(shape.fill.r, shape.fill.g, shape.fill.b, shape.fill.a)
+    cr.fill_preserve()
+    if shape.stroke is not None:
+        cr.set_source_rgba(
+            shape.stroke.r, shape.stroke.g, shape.stroke.b, shape.stroke.a
+        )
+        cr.set_line_width(shape.stroke_thickness)
+        cr.stroke()
+
+    cr.restore()
+
+
+def draw_text(cr, text):
+    cr.save()
+
+    cr.select_font_face(text.font.family)
+    cr.set_font_size(text.font.size)
+    cr.move_to(text.location[0], text.location[1])
+    cr.show_text(text.content)
+
+    cr.restore()
+
+
+def draw_scene(cr, scene: Scene):
+    for item in scene.items:
+        if item.item_type == "shape":
+            draw_shape(cr, item)
+        elif item.item_type == "text":
+            draw_text(cr, item)
+
+
+def draw_svg(scene: Scene, path: Path):
+    with cairo.SVGSurface(path, scene.size[0], scene.size[1]) as surface:
+        cr = cairo.Context(surface)
+        draw_scene(cr, scene)

icplot-0.0.13/src/icplot/gantt/gantt_renderer.py

@@ -0,0 +1,59 @@
+from iccore.project import Milestone
+from icplot.geometry import Scene, SceneItem, Rectangle
+
+from .gantt import GanttChart
+
+
+def _render_milestone(
+    gantt: GanttChart, milestone: Milestone, chart_range, yloc
+) -> SceneItem:
+    # chart_delta = chart_range[1] - chart_range[0]
+    chart_delta = 0
+    start_delta = milestone.start_date - chart_range[0]
+    # milestone_delta = milestone.due_date - milestone.start_date
+    milestone_delta = 0
+
+    start_frac = float(start_delta / chart_delta)
+    milestone_frac = float(milestone_delta / chart_delta)
+
+    w = milestone_frac * gantt.width
+    h = gantt.bar_max_height * gantt.height
+    x = start_frac * gantt.width
+    y = yloc
+
+    rect = Rectangle(w=w, h=h, location=(x, y), fill=gantt.bar_color)
+    return rect
+
+
+def _render_milestones(gantt: GanttChart):
+
+    if not gantt.milestones:
+        return
+
+    milestones = gantt.milestones
+    # milestones.sort(key=lambda x: x.start_date, reverse=True)
+
+    start_date = gantt.start_date
+    end_date = gantt.end_date
+    if not start_date:
+        start_date = milestones[0].start_date
+
+    # if not end_date:
+    #    end_date = max(m.due_date for m in milestones)
+
+    chart_range = (start_date, end_date)
+    yloc = 0.0
+    bar_height = gantt.bar_max_height * gantt.height
+    scene_items = []
+    for milestone in milestones:
+        item = _render_milestone(gantt, milestone, chart_range, yloc)
+        scene_items.append(item)
+        yloc += bar_height
+    return scene_items
+
+
+def render(gantt: GanttChart) -> Scene:
+    scene = Scene()
+    items = _render_milestones(gantt)
+    scene.items.extend(items)
+    return scene

icplot-0.0.13/src/icplot/gantt/pgfgantt.py

@@ -0,0 +1,15 @@
+from pathlib import Path
+
+from .gantt import GanttChart
+
+
+def render(gantt: GanttChart) -> str:
+
+    with open(Path(__file__).parent / "pgfgantt.tex", "r", encoding="utf-8") as f:
+        template = f.read()
+
+    if gantt.title:
+        title_str = f"\\title{{{gantt.title}}}"
+        template.replace("%%TITLE%%", title_str)
+
+    return template

icplot-0.0.13/src/icplot/geometry.py

@@ -0,0 +1,45 @@
+from pydantic import BaseModel
+
+from .color import Color
+
+
+class Font(BaseModel):
+
+    family: str = "Sans"
+    weight: str = "normal"
+    slant: str = "normal"
+    size: float = 0.5
+
+
+class SceneItem(BaseModel):
+
+    item_type: str
+    location: tuple[float, float] = (0.0, 0.0)
+
+
+class Shape(SceneItem):
+
+    item_type: str = "shape"
+    fill: Color = Color()
+    stroke: Color = Color()
+    stroke_thickness: float = 0.5
+
+
+class TextPath(SceneItem):
+
+    item_type: str = "text"
+    content: str
+    font: Font = Font()
+
+
+class Rectangle(Shape):
+
+    item_type: str = "rect"
+    w: float
+    h: float
+
+
+class Scene(BaseModel):
+
+    items: list[SceneItem] = []
+    size: tuple[int, int] = (100, 100)

{icplot-0.0.11 → icplot-0.0.13}/src/icplot/graph/axis.py

@@ -27,7 +27,8 @@ class PlotAxis(BaseModel):
     label: str = ""
     ticks: Range | None = None
 
-    def get_resolved_ticks(self) -> list:
+    @property
+    def resolved_ticks(self) -> list:
         if self.ticks:
             return self.ticks.eval()
         return []

icplot-0.0.13/src/icplot/graph/generator.py

@@ -0,0 +1,84 @@
+from typing import Any, Callable
+import copy
+import os
+from pathlib import Path
+
+from pydantic import BaseModel
+
+from .plot import Plot
+from .series import LinePlotSeries
+from .matplotlib import MatplotlibPlotter
+
+
+class PlotConfig(BaseModel):
+
+    series_attr: str
+    x_attr: str
+    plots: dict[str, Plot]
+    colormap: Any
+
+
+def make_plots(
+    results: list[Any], config: PlotConfig, point_func: Callable
+) -> list[Plot]:
+    """
+    For a set of results and a given plot config generate a list of
+    plots.
+    """
+
+    # The instance attribute value for 'series_attr' is used to generate
+    # a set of labels, one per plot series
+    series_labels = set(getattr(r, config.series_attr) for r in results)
+
+    plots: list[Plot] = []
+    # Each 'y attribute' in the config corresponds to a 'plot' of this
+    # attribute's values.
+    for y_attr, plot_template in config.plots.items():
+        new_plot = copy.deepcopy(plot_template)
+        new_plot.name = y_attr
+        series = []
+
+        for label in series_labels:
+            # Get results for this series
+            label_results = [
+                r for r in results if getattr(r, config.series_attr) == label
+            ]
+
+            # Use a user-provided 'point_func' to get the series 'x, y' points
+            # from the results, given a 'x_attr, y_attr' pair
+            points = [point_func(r, config.x_attr, y_attr) for r in label_results].sort(
+                key=lambda x: x[0]
+            )
+            x, y = zip(*points)
+
+            if label in config.colormap:
+                series.append(
+                    LinePlotSeries(
+                        x=x,
+                        y=y,
+                        label=label,
+                        highlight=True,
+                        color=config.colormap[label],
+                    )
+                )
+            else:
+                series.append(LinePlotSeries(x=x, y=y, label=label))
+        new_plot.series.extend(series)
+        plots.append(new_plot)
+    return plots
+
+
+def plot(
+    results: list[Any],
+    config: PlotConfig,
+    point_func: Callable,
+    output_dir: Path = Path(os.getcwd()),
+    plotter=MatplotlibPlotter(),
+):
+    """
+    For a given set of results and plot config generate the
+    corresponding plots and render them to files.
+    """
+
+    for p in make_plots(results, config, point_func):
+        plotter.plot(p, output_dir / f"{p.name}.svg")

{icplot-0.0.11 → icplot-0.0.13}/src/icplot/graph/matplotlib.py

@@ -39,9 +39,9 @@ class MatplotlibPlotter(Plotter):
         if plot.y_axis.label:
             ax.set_ylabel(plot.y_axis.label)
         if plot.x_axis.ticks:
-            ax.set_xticks(plot.x_axis.get_resolved_ticks())
+            ax.set_xticks(plot.x_axis.resolved_ticks)
         if plot.y_axis.ticks:
-            ax.set_yticks(plot.y_axis.get_resolved_ticks())
+            ax.set_yticks(plot.y_axis.resolved_ticks)
         if plot.title:
             ax.set_title(plot.title)
 

{icplot-0.0.11 → icplot-0.0.13}/src/icplot/graph/plot.py

@@ -17,14 +17,12 @@ class Plot(BaseModel):
 
     title: str = ""
     legend_label: str = ""
+    name: str = ""
     x_axis: PlotAxis = PlotAxis()
     y_axis: PlotAxis = PlotAxis()
     plot_type: str = ""
     series: list[PlotSeries] = []
 
-    def add_series(self, series: PlotSeries):
-        self.series.append(series)
-
 
 class GridPlot(Plot):
     """

{icplot-0.0.11 → icplot-0.0.13}/src/icplot/main_cli.py

@@ -10,7 +10,8 @@ from iccore.serialization import read_yaml
 from icplot.graph import Plot
 from icplot.graph.matplotlib import MatplotlibPlotter
 from icplot.image_utils import pdf_to_png, svg_to_png, svg_to_pdf
-from icplot.tex_interface import TexBuildSettings, TexInterface
+from icplot import tex
+from icplot.tex import TexBuildSettings
 
 logger = logging.getLogger(__name__)
 
@@ -44,8 +45,6 @@ def convert(args):
         settings = TexBuildSettings(
             args.source.resolve(), args.build_dir.resolve(), args.target
         )
-
-        tex = TexInterface()
         tex.build(settings)
 
     logger.info("Finished conversion")

icplot-0.0.13/src/icplot/tex.py

@@ -0,0 +1,77 @@
+"""
+This module has functionality for publishing Tex documents
+"""
+
+import subprocess
+from typing import NamedTuple
+import shutil
+import os
+from pathlib import Path
+import logging
+
+from .image_utils import pdf_to_png
+
+logger = logging.getLogger(__name__)
+
+
+class TexBuildSettings(NamedTuple):
+    """
+    This holds settings for the Tex build
+    """
+
+    source: Path
+    build_dir: Path
+    output_dir: Path | None = None
+    build_engine: str = "pdflatex"
+    output_png: bool = True
+    clear_workdir: bool = True
+
+
+def build_pdf(settings: TexBuildSettings, work_dir: Path):
+
+    cmd = f"{settings.build_engine} {settings.source}"
+    with open(work_dir / "stdout.txt", "w", encoding="utf-8") as f:
+        subprocess.run(cmd, shell=True, check=True, cwd=work_dir, stdout=f, stderr=f)
+
+
+def build_single(settings: TexBuildSettings):
+    logger.info("Building source: %s", settings.source)
+
+    # Make a working dir
+    work_dir = settings.build_dir / settings.source.stem
+    os.makedirs(work_dir, exist_ok=True)
+
+    build_pdf(settings, work_dir)
+
+    tex_path = work_dir / settings.source.name
+    pdf_path = tex_path.parent / f"{tex_path.stem}.pdf"
+    if settings.output_png:
+        pdf_to_png(pdf_path)
+
+    # If output dir is different to build dir copy final content there
+    if settings.output_dir and settings.output_dir != work_dir:
+        os.makedirs(settings.output_dir, exist_ok=True)
+        shutil.copy(pdf_path, settings.output_dir)
+
+        if settings.output_png:
+            png_path = pdf_path.parent / f"{tex_path.stem}.png"
+            shutil.copy(png_path, settings.output_dir)
+
+        if settings.clear_workdir:
+            shutil.rmtree(work_dir)
+
+
+def build(settings: TexBuildSettings):
+    if settings.source.is_dir():
+        for tex_file in settings.source.glob("*.tex"):
+            single_build = TexBuildSettings(
+                tex_file,
+                settings.build_dir,
+                settings.output_dir,
+                settings.build_engine,
+            )
+            build_single(single_build)
+    else:
+        build_single(settings)
+
+    logger.info("Finished building sources")

icplot-0.0.13/src/icplot/trace/__init__.py

@@ -0,0 +1 @@
+from .trace import *  # NOQA

{icplot-0.0.11 → icplot-0.0.13/src/icplot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: icplot
-Version: 0.0.11
+Version: 0.0.13
 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
@@ -16,7 +16,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: wand
 Requires-Dist: matplotlib
-Requires-Dist: iccore==0.1.1
+Requires-Dist: iccore==0.1.5
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: pytest-cov; extra == "test"

{icplot-0.0.11 → icplot-0.0.13}/src/icplot.egg-info/SOURCES.txt

@@ -9,7 +9,7 @@ src/icplot/geometry.py
 src/icplot/image_utils.py
 src/icplot/main_cli.py
 src/icplot/py.typed
-src/icplot/tex_interface.py
+src/icplot/tex.py
 src/icplot.egg-info/PKG-INFO
 src/icplot.egg-info/SOURCES.txt
 src/icplot.egg-info/dependency_links.txt
@@ -19,13 +19,16 @@ src/icplot.egg-info/top_level.txt
 src/icplot/gantt/__init__.py
 src/icplot/gantt/gantt.py
 src/icplot/gantt/gantt_renderer.py
-src/icplot/gantt/pgfgantt_interface.py
+src/icplot/gantt/pgfgantt.py
 src/icplot/graph/__init__.py
 src/icplot/graph/axis.py
+src/icplot/graph/generator.py
 src/icplot/graph/matplotlib.py
 src/icplot/graph/plot.py
 src/icplot/graph/plotter.py
 src/icplot/graph/series.py
+src/icplot/trace/__init__.py
+src/icplot/trace/trace.py
 test/test_cairo_interface.py
 test/test_gantt_chart.py
 test/test_image_utils.py

{icplot-0.0.11 → icplot-0.0.13}/src/icplot.egg-info/requires.txt

@@ -1,6 +1,6 @@
 wand
 matplotlib
-iccore==0.1.1
+iccore==0.1.5
 
 [cairo]
 pycairo

icplot-0.0.13/test/test_cairo_interface.py

@@ -0,0 +1,31 @@
+import os
+import shutil
+
+from iccore.test_utils import get_test_output_dir
+
+from icplot import cairo_interface
+from icplot.geometry import Scene, Rectangle, TextPath
+from icplot.color import Color
+
+
+def test_cairo_interface():
+
+    scene_items = []
+    rect = Rectangle(
+        w=20, h=20, location= (10, 10),
+        fill = Color.from_rgba(0.5, 0.5, 1, 0.5),
+        stroke = Color.from_rgba(0.5, 0.0, 0.0, 0.5)
+    )
+    scene_items.append(rect)
+
+    text = TextPath(content="Hello World",
+                    location=(5,5))
+    scene_items.append(text)
+
+    output_dir = get_test_output_dir()
+    os.makedirs(output_dir, exist_ok=True)
+
+    scene = Scene(items=scene_items)
+    cairo_interface.draw_svg(scene, output_dir / "output.svg")
+    shutil.rmtree(output_dir)
+    

{icplot-0.0.11 → icplot-0.0.13}/test/test_tex_interface.py

@@ -3,7 +3,8 @@ from pathlib import Path
 
 from iccore.test_utils import get_test_data_dir, get_test_output_dir
 
-from icplot.tex_interface import TexBuildSettings, TexInterface
+from icplot import tex
+from icplot.tex import TexBuildSettings
 
 
 def test_tex_interface():
@@ -14,8 +15,6 @@ def test_tex_interface():
     
     settings = TexBuildSettings(source, build_dir, build_dir)
     
-    tex = TexInterface()
-
     tex.build(settings)
 
     assert Path(build_dir / "test.pdf").exists()

icplot-0.0.11/src/icplot/cairo_interface.py

@@ -1,60 +0,0 @@
-from pathlib import Path
-
-import cairo
-
-from .geometry import Scene, Rectangle
-
-
-class CairoInterface:
-
-    def __init__(self):
-        pass
-
-    def draw_rect(self, cr, rect: Rectangle):
-        x0, y0 = rect.location
-        x1 = rect.w
-        y1 = rect.h
-        cr.move_to(x0, y0)
-        cr.line_to(x1, y0)
-        cr.line_to(x1, y1)
-        cr.line_to(x0, y1)
-        cr.close_path()
-
-    def draw_shape(self, cr, shape):
-        cr.save()
-        if shape.shape_type == "rect":
-            self.draw_rect(cr, shape)
-        else:
-            return
-        cr.set_source_rgba(shape.fill.r, shape.fill.g, shape.fill.b, shape.fill.a)
-        cr.fill_preserve()
-        if shape.stroke is not None:
-            cr.set_source_rgba(
-                shape.stroke.r, shape.stroke.g, shape.stroke.b, shape.stroke.a
-            )
-            cr.set_line_width(shape.stroke_thickness)
-            cr.stroke()
-
-        cr.restore()
-
-    def draw_text(self, cr, text):
-        cr.save()
-
-        cr.select_font_face(text.font.family)
-        cr.set_font_size(text.font.size)
-        cr.move_to(text.location[0], text.location[1])
-        cr.show_text(text.content)
-
-        cr.restore()
-
-    def draw_scene(self, cr, scene: Scene):
-        for item in scene.items:
-            if item.item_type == "shape":
-                self.draw_shape(cr, item)
-            elif item.item_type == "text":
-                self.draw_text(cr, item)
-
-    def draw_svg(self, scene: Scene, path: Path):
-        with cairo.SVGSurface(path, scene.size[0], scene.size[1]) as surface:
-            cr = cairo.Context(surface)
-            self.draw_scene(cr, scene)

icplot-0.0.11/src/icplot/gantt/gantt_renderer.py

@@ -1,59 +0,0 @@
-from iccore.project import Milestone
-from icplot.geometry import Scene, Rectangle
-
-from .gantt import GanttChart
-
-
-class GanttRenderer:
-
-    def _add_milestone(
-        self, gantt: GanttChart, scene: Scene, milestone: Milestone, chart_range, yloc
-    ):
-        # chart_delta = chart_range[1] - chart_range[0]
-        chart_delta = 0
-        start_delta = milestone.start_date - chart_range[0]
-        # milestone_delta = milestone.due_date - milestone.start_date
-        milestone_delta = 0
-
-        start_frac = float(start_delta / chart_delta)
-        milestone_frac = float(milestone_delta / chart_delta)
-
-        w = milestone_frac * gantt.width
-        h = gantt.bar_max_height * gantt.height
-        x = start_frac * gantt.width
-        y = yloc
-
-        rect = Rectangle(w, h)
-        rect.location = (x, y)
-        rect.fill = gantt.bar_color
-        scene.items.append(rect)
-
-    def _add_milestones(self, gantt: GanttChart, scene: Scene):
-
-        if not gantt.milestones:
-            return
-
-        milestones = gantt.milestones
-        # milestones.sort(key=lambda x: x.start_date, reverse=True)
-
-        start_date = gantt.start_date
-        end_date = gantt.end_date
-        if not start_date:
-            start_date = milestones[0].start_date
-
-        # if not end_date:
-        #    end_date = max(m.due_date for m in milestones)
-
-        chart_range = (start_date, end_date)
-        yloc = 0.0
-        bar_height = gantt.bar_max_height * gantt.height
-        for milestone in milestones:
-            self._add_milestone(gantt, scene, milestone, chart_range, yloc)
-            yloc += bar_height
-
-    def render(self, gantt: GanttChart) -> Scene:
-        scene = Scene()
-
-        self._add_milestones(gantt, scene)
-
-        return scene

icplot-0.0.11/src/icplot/gantt/pgfgantt_interface.py

@@ -1,26 +0,0 @@
-from pathlib import Path
-
-from .gantt import GanttChart
-
-
-class PgfGanttRenderer:
-
-    def __init__(self):
-        self.template: str = ""
-
-    def _load_template(self):
-        if self.template:
-            return
-
-        with open(Path(__file__).parent / "pgfgantt.tex", "r", encoding="utf-8") as f:
-            self.template = f.read()
-
-    def render(self, gantt: GanttChart) -> str:
-
-        output = self.template
-
-        if gantt.title:
-            title_str = f"\\title{{{gantt.title}}}"
-            output.replace("%%TITLE%%", title_str)
-
-        return output

icplot-0.0.11/src/icplot/geometry.py

@@ -1,50 +0,0 @@
-from .color import Color
-
-
-class Font:
-
-    def __init__(self, family="Sans"):
-        self.family = family
-        self.weight = "normal"
-        self.slant = "normal"
-        self.size = 0.5
-
-
-class SceneItem:
-
-    def __init__(self, item_type):
-        self.location = (0, 0)
-        self.item_type = item_type
-
-
-class Shape(SceneItem):
-
-    def __init__(self, shape_type):
-        super().__init__("shape")
-        self.shape_type = shape_type
-        self.fill = Color()
-        self.stroke = None
-        self.stroke_thickness = 0.5
-
-
-class TextPath(SceneItem):
-
-    def __init__(self, content):
-        super().__init__("text")
-        self.content = content
-        self.font = Font()
-
-
-class Rectangle(Shape):
-
-    def __init__(self, w=1.0, h=1.0):
-        super().__init__("rect")
-        self.w = w
-        self.h = h
-
-
-class Scene:
-
-    def __init__(self):
-        self.items = []
-        self.size = (100, 100)

icplot-0.0.11/src/icplot/tex_interface.py

@@ -1,83 +0,0 @@
-"""
-This module has functionality for publishing Tex documents
-"""
-
-import subprocess
-from typing import NamedTuple
-import shutil
-import os
-from pathlib import Path
-import logging
-
-from .image_utils import pdf_to_png
-
-logger = logging.getLogger(__name__)
-
-
-class TexBuildSettings(NamedTuple):
-    """
-    This holds settings for the Tex build
-    """
-
-    source: Path
-    build_dir: Path
-    output_dir: Path | None = None
-    build_engine: str = "pdflatex"
-    output_png: bool = True
-    clear_workdir: bool = True
-
-
-class TexInterface:
-    """
-    This is an interface to Tex for building Tex doucments.
-    """
-
-    def build_pdf(self, settings: TexBuildSettings, work_dir: Path):
-
-        cmd = f"{settings.build_engine} {settings.source}"
-
-        with open(work_dir / "stdout.txt", "w", encoding="utf-8") as f:
-            subprocess.run(
-                cmd, shell=True, check=True, cwd=work_dir, stdout=f, stderr=f
-            )
-
-    def build_single(self, settings: TexBuildSettings):
-        logger.info("Building source: %s", settings.source)
-
-        # Make a working dir
-        work_dir = settings.build_dir / settings.source.stem
-        os.makedirs(work_dir, exist_ok=True)
-
-        self.build_pdf(settings, work_dir)
-
-        tex_path = work_dir / settings.source.name
-        pdf_path = tex_path.parent / f"{tex_path.stem}.pdf"
-        if settings.output_png:
-            pdf_to_png(pdf_path)
-
-        # If output dir is different to build dir copy final content there
-        if settings.output_dir and settings.output_dir != work_dir:
-            os.makedirs(settings.output_dir, exist_ok=True)
-            shutil.copy(pdf_path, settings.output_dir)
-
-            if settings.output_png:
-                png_path = pdf_path.parent / f"{tex_path.stem}.png"
-                shutil.copy(png_path, settings.output_dir)
-
-            if settings.clear_workdir:
-                shutil.rmtree(work_dir)
-
-    def build(self, settings: TexBuildSettings):
-        if settings.source.is_dir():
-            for tex_file in settings.source.glob("*.tex"):
-                single_build = TexBuildSettings(
-                    tex_file,
-                    settings.build_dir,
-                    settings.output_dir,
-                    settings.build_engine,
-                )
-                self.build_single(single_build)
-        else:
-            self.build_single(settings)
-
-        logger.info("Finished building sources")

icplot-0.0.11/test/test_cairo_interface.py

@@ -1,29 +0,0 @@
-from pathlib import Path
-import os
-import shutil
-
-from icplot.cairo_interface import CairoInterface
-from icplot.geometry import Scene, Rectangle, TextPath
-from icplot.color import Color
-
-
-def test_cairo_interface():
-
-    cairo_interface = CairoInterface()
-    scene = Scene()
-
-    rect = Rectangle(20, 20)
-    rect.location = (10, 10)
-    rect.fill = Color.from_rgba(0.5, 0.5, 1, 0.5)
-    rect.stroke = Color.from_rgba(0.5, 0.0, 0.0, 0.5)
-    scene.items.append(rect)
-
-    text = TextPath("Hello World")
-    text.location = (5, 5)
-    scene.items.append(text)
-
-    output_dir = Path(os.getcwd()) / "test_cairo_interface"
-    os.makedirs(output_dir, exist_ok=True)
-    cairo_interface.draw_svg(scene, output_dir / "output.svg")
-    shutil.rmtree(output_dir)
-