ScadPy 0.4.5__tar.gz → 0.4.6__tar.gz

scadpy-0.4.6/.github/workflows/ci.yml

@@ -0,0 +1,60 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "**"
+  pull_request:
+
+jobs:
+  typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install dependencies
+        run: pip install -e .[dev]
+
+      - name: Run basedpyright
+        run: basedpyright
+
+  doctest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.12", "3.13"]
+        include:
+          # Snapshot comparison is only meaningful on the reference platform.
+          # On macOS and Windows, matplotlib produces slightly different SVG
+          # floating-point values, so we use doctest-without-snapshots there.
+          - os: ubuntu-latest
+            doctest_target: doctest
+          - os: macos-latest
+            doctest_target: doctest-without-snapshots
+          - os: windows-latest
+            doctest_target: doctest-without-snapshots
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install make (Windows)
+        if: runner.os == 'Windows'
+        run: choco install make
+
+      - name: Install dependencies
+        run: pip install -e .[dev]
+
+      - name: Run doctests
+        run: cd docs && make ${{ matrix.doctest_target }}
+        env:
+          MPLBACKEND: Agg

{scadpy-0.4.5 → scadpy-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ScadPy
-Version: 0.4.5
+Version: 0.4.6
 Summary: Simplified 2D/3D modeling for Python with fluent API and boolean operations
 Author: m-fabregue
 License: # MIT License
@@ -59,6 +59,7 @@ Requires-Dist: python-fcl~=0.7
 Requires-Dist: triangle==20250106
 Requires-Dist: trimesh[easy]~=4.10
 Provides-Extra: dev
+Requires-Dist: basedpyright; extra == 'dev'
 Requires-Dist: coverage; extra == 'dev'
 Requires-Dist: furo==2025.7.19; extra == 'dev'
 Requires-Dist: genbadge[coverage]; extra == 'dev'

{scadpy-0.4.5 → scadpy-0.4.6}/docs/Makefile

@@ -15,7 +15,7 @@ skills:
 help:
 	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile snapshots
+.PHONY: help Makefile snapshots doctest-without-snapshots
 
 # Build the documentation
 html:
@@ -27,6 +27,10 @@ doctest:
 	@$(SPHINXBUILD) -b doctest "$(SOURCEDIR)" "$(BUILDDIR)/doctest" $(SPHINXOPTS)
 	@rm -rf $(BUILDDIR)/doctrees
 
+doctest-without-snapshots:
+	@SCADPY_UPDATE_SNAPSHOTS=1 $(SPHINXBUILD) -b doctest "$(SOURCEDIR)" "$(BUILDDIR)/doctest" $(SPHINXOPTS)
+	@rm -rf $(BUILDDIR)/doctrees
+
 snapshots:
 	@SCADPY_UPDATE_SNAPSHOTS=1 $(SPHINXBUILD) -b doctest "$(SOURCEDIR)" "$(BUILDDIR)/doctest" $(SPHINXOPTS)
 	@rm -rf $(BUILDDIR)/doctrees

{scadpy-0.4.5 → scadpy-0.4.6}/docs/_static/badges/coverage.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="114" height="20" role="img" aria-label="coverage: 90.20%"><title>coverage: 90.20%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="114" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="53" height="20" fill="#4c1"/><rect width="114" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="865" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">90.20%</text><text x="865" y="140" transform="scale(.1)" fill="#fff" textLength="430">90.20%</text></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="114" height="20" role="img" aria-label="coverage: 90.21%"><title>coverage: 90.21%</title><linearGradient id="s" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="r"><rect width="114" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#r)"><rect width="61" height="20" fill="#555"/><rect x="61" width="53" height="20" fill="#4c1"/><rect width="114" height="20" fill="url(#s)"/></g><g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110"><text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text><text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text><text aria-hidden="true" x="865" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="430">90.21%</text><text x="865" y="140" transform="scale(.1)" fill="#fff" textLength="430">90.21%</text></g></svg>

{scadpy-0.4.5 → scadpy-0.4.6}/docs/scripts/build_skills.py

@@ -8,6 +8,7 @@ import json
 import re
 import tomllib
 from pathlib import Path
+from typing import Any
 
 # Dunder → operator symbol
 DUNDER_OPERATORS: dict[str, str] = {
@@ -239,15 +240,15 @@ def _referenced_func(description: str | None) -> str | None:
 # ---------------------------------------------------------------------------
 
 
-def _extract_params(func: ast.FunctionDef | ast.AsyncFunctionDef) -> list[dict]:
-    params: list[dict] = []
+def _extract_params(func: ast.FunctionDef | ast.AsyncFunctionDef) -> list[dict[str, Any]]:
+    params: list[dict[str, Any]] = []
     args = func.args
     defaults_start = len(args.args) - len(args.defaults)
 
     for i, arg in enumerate(args.args):
         if arg.arg in ("self", "cls"):
             continue
-        p: dict = {"name": arg.arg}
+        p: dict[str, Any] = {"name": arg.arg}
         if arg.annotation:
             p["type"] = _unparse_annotation(arg.annotation)
         di = i - defaults_start
@@ -259,15 +260,16 @@ def _extract_params(func: ast.FunctionDef | ast.AsyncFunctionDef) -> list[dict]:
         p = {"name": arg.arg}
         if arg.annotation:
             p["type"] = _unparse_annotation(arg.annotation)
-        if args.kw_defaults[i] is not None:
-            p["default"] = ast.unparse(args.kw_defaults[i])
+        kw_default = args.kw_defaults[i]
+        if kw_default is not None:
+            p["default"] = ast.unparse(kw_default)
         params.append(p)
 
     return params
 
 
 def _build_signature(
-    name: str, params: list[dict], returns: str | None, is_property: bool
+    name: str, params: list[dict[str, Any]], returns: str | None, is_property: bool
 ) -> str:
     if is_property:
         sig = name
@@ -290,7 +292,7 @@ def _parse_function(
     node: ast.FunctionDef | ast.AsyncFunctionDef,
     func_index: dict[str, str],
     is_method: bool = False,
-) -> dict:
+) -> dict[str, Any]:
     decorator_names = [
         (
             d.id
@@ -323,7 +325,7 @@ def _parse_function(
             if p["name"] in param_descs and param_descs[p["name"]]:
                 p["description"] = param_descs[p["name"]]
 
-    entry: dict = {
+    entry: dict[str, Any] = {
         "kind": kind,
         "signature": _build_signature(node.name, params, returns, is_property),
         "description": _extract_description(raw_docstring),
@@ -339,8 +341,8 @@ def _parse_function(
     return entry
 
 
-def _parse_class(node: ast.ClassDef, func_index: dict[str, str]) -> dict:
-    methods: dict[str, dict] = {}
+def _parse_class(node: ast.ClassDef, func_index: dict[str, str]) -> dict[str, Any]:
+    methods: dict[str, dict[str, Any]] = {}
     for item in ast.iter_child_nodes(node):
         if isinstance(item, (ast.FunctionDef, ast.AsyncFunctionDef)):
             methods[item.name] = _parse_function(item, func_index, is_method=True)
@@ -352,9 +354,9 @@ def _parse_class(node: ast.ClassDef, func_index: dict[str, str]) -> dict:
     }
 
 
-def parse_file(path: Path, func_index: dict[str, str]) -> dict:
+def parse_file(path: Path, func_index: dict[str, str]) -> dict[str, Any]:
     tree = ast.parse(path.read_text())
-    result: dict = {}
+    result: dict[str, Any] = {}
     for node in ast.iter_child_nodes(tree):
         if isinstance(node, ast.ClassDef):
             result[node.name] = _parse_class(node, func_index)
@@ -382,7 +384,7 @@ def main() -> None:
     func_index = _build_function_index(root)
     print(f"  {len(func_index)} functions indexed")
 
-    skills: dict = {}
+    skills: dict[str, Any] = {}
     for src in sources:
         p = root / src
         if p.is_dir():

{scadpy-0.4.5 → scadpy-0.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ScadPy"
-version = "0.4.5"
+version = "0.4.6"
 description = "Simplified 2D/3D modeling for Python with fluent API and boolean operations"
 requires-python = ">= 3.12"
 authors = [{ name = "m-fabregue" }]
@@ -20,14 +20,15 @@ dependencies = ["triangle == 20250106", "trimesh[easy] ~= 4.10", "manifold3d ==
 
 [project.optional-dependencies]
 dev = [
-    "sphinx",
-    "sphinx-pyproject",
-    "numpydoc",
-    "sphinx-autodoc-typehints",
+    "basedpyright",
+    "coverage",
     "furo == 2025.7.19",
+    "genbadge[coverage]",
     "interrogate",
-    "coverage",
-    "genbadge[coverage]"
+    "numpydoc",
+    "sphinx",
+    "sphinx-autodoc-typehints",
+    "sphinx-pyproject",
 ]
 
 [tool.pyright]

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/__init__.py

@@ -1,3 +1,4 @@
+# pyright: reportImportCycles=false
 from .color import *  # noqa: F403
 from .core import *  # noqa: F403
 from .d2 import *  # noqa: F403

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/color/__init__.py

@@ -1,3 +1,4 @@
+# pyright: reportImportCycles=false
 from .constants import *
 from .type import *
 from .utils import *

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/core/assembly/__init__.py

@@ -1,3 +1,4 @@
+# pyright: reportImportCycles=false
 from .combinations import *  # noqa: F403
 from .topologies import *  # noqa: F403
 from .transformations import *  # noqa: F403

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/d2/__init__.py

@@ -1,2 +1,3 @@
+# pyright: reportImportCycles=false
 from .shape import *  # noqa: F403
 from .utils import *  # noqa: F403

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/d2/shape/__init__.py

@@ -1,3 +1,4 @@
+# pyright: reportImportCycles=false
 from .combinations import *  # noqa: F403
 from .exporters import *  # noqa: F403
 from .features import *  # noqa: F403

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/d2/shape/exporters/map_shape_to_html.py

@@ -84,13 +84,16 @@ def map_shape_to_html(
 
     for part in shape._parts:
         color = part.color
-        edge_color = tuple((c + b) / 2 for c, b in zip(color[:3], background_color[:3]))
+        edge_color = [(c + b) / 2 for c, b in zip(color[:3], background_color[:3])]
+        edge_color_rgba: tuple[float, float, float, float] = (
+            edge_color[0], edge_color[1], edge_color[2], 1.0
+        )
         plot_polygon(
             part.geometry,
             ax=ax,
             add_points=False,
             facecolor=(color[0], color[1], color[2], color[3]),
-            edgecolor=(*edge_color, 1.0),
+            edgecolor=edge_color_rgba,
             linewidth=2,
         )
 

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/d2/shape/transformations/radial_extrude_shape.py

@@ -88,11 +88,11 @@ def _radial_extrude_shapely_polygon_into_trimesh(
 
     triangulated_border_vertex_count = len(triangulated_vertex_coordinates)
     triangulated_edge_to_vertex_sorted = np.sort(triangulated_edge_to_vertex, axis=1)
-    triangulated_edge_unique = group_rows(
-        triangulated_edge_to_vertex_sorted, require_count=1
+    triangulated_edge_unique = np.asarray(
+        group_rows(triangulated_edge_to_vertex_sorted, require_count=1), dtype=np.intp
     )
     slice_border_faces = _create_slice_border_faces(
-        triangulated_edge_to_vertex[triangulated_edge_unique],
+        triangulated_edge_to_vertex[triangulated_edge_unique].astype(np.int64),
         triangulated_border_vertex_count,
         slice_count - 1,
         is_ring,

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/d3/__init__.py

@@ -1,2 +1,3 @@
+# pyright: reportImportCycles=false
 from .solid import *  # noqa: F403
 from .utils import *  # noqa: F403

{scadpy-0.4.5 → scadpy-0.4.6}/scadpy/d3/solid/__init__.py

@@ -1,3 +1,4 @@
+# pyright: reportImportCycles=false
 from .combinations import *  # noqa: F403
 from .exporters import *  # noqa: F403
 from .features import *  # noqa: F403

scadpy-0.4.5/.github/workflows/ci.yml

@@ -1,26 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - "**"
-  pull_request:
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Install system dependencies
-        run: sudo apt-get install -y libegl1
-
-      - name: Install dependencies
-        run: pip install -e .[dev]
-
-      - name: Run doctests
-        run: cd docs && make doctest