Merge branch 'develop'

Author: joansalasoler

.github/workflows/python-package.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
 
     steps:
     - uses: actions/checkout@v4

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change log
 
+## 1.2.0 (2025-11-20)
+
+* Adds support for Python 3.13.
+* Adds support for Gscrib 1.2.0.
+* Adds support for Vpype 1.15.0.
+* Adds `tox` for multi-version testing with Poetry.
+* Relaxes dependency constraints and upgrades multiple dependencies.
+
 ## 1.1.1 (2025-05-01)
 
 * Rename HeightMap.get_height_at to HeightMap.get_depth_at.

docs/index.rst

@@ -84,7 +84,6 @@ API Reference
    vpype_gscrib.config
    vpype_gscrib.enums
    vpype_gscrib.excepts
-   vpype_gscrib.heightmaps
    vpype_gscrib.processor
    vpype_gscrib.renderer
    vpype_gscrib.renderer.beds

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "vpype_gscrib"
-version = "1.1.1"
+version = "1.2.0"
 description = "G-Code generator for Vpype"
 authors = ["Joan Sala <contact@joansala.com>"]
 license = "GPL-3.0"
@@ -11,22 +11,38 @@ documentation = "https://vpype-gscrib.readthedocs.io"
 keywords = ["Vpype", "G-code", "CNC", "3D printing", "CAM"]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.13"
-gscrib = "~1.1.0"
-numpy = "~2.2.0"
-opencv-python = "~4.11.0"
-pydantic = "~2.10.0"
-pyserial = "~3.5.0"
-scikit-image = "~0.25.0"
-scipy = "~1.15.0"
-typeguard = "~4.4.0"
-vpype = "~1.14.0"
-
-[tool.poetry.dev-dependencies]
+python = ">=3.10,<3.14"
+gscrib = ">=1.2.0,<2.0"
+numpy = ">=2.2.0,<3"
+opencv-python = ">=4.10.0,<5.0"
+pydantic = ">=2.8.0,<3.0"
+pyserial = ">=3.5.0,<4.0"
+scikit-image = ">=0.23.0,<1.0"
+scipy = ">=1.14.0,<2.0"
+typeguard = ">=4.3.0,<5.0"
+vpype = ">=1.14.0,<2.0"
+
+[tool.poetry.group.dev.dependencies]
 mock = "~5.2.0"
-pre-commit = "~4.1.0"
-pylint = "~3.3.0"
-pytest = "~8.3.0"
+pre-commit = "~4.2.0"
+pylint = "~3.3.7"
+pytest = "~8.4.1"
+tox = "~4.32.0"
+
+[tool.poetry.group.docs.dependencies]
+vpython = "~7.6.0"
+Sphinx = "~8.1.0"
+sphinx-click = "~6.0.0"
+sphinx-copybutton = "~0.5.2"
+sphinx-rtd-theme = "~3.0.2"
+sphinxcontrib-applehelp = "~2.0.0"
+sphinxcontrib-devhelp = "~2.0.0"
+sphinxcontrib-htmlhelp = "~2.1.0"
+sphinxcontrib-jquery = "~4.1.0"
+sphinxcontrib-jsmath = "~1.0.1"
+sphinxcontrib-qthelp = "~2.0.0"
+sphinxcontrib-serializinghtml = "~2.0.0"
+myst-parser = "~4.0.1"
 
 [tool.poetry.plugins."vpype.plugins"]
 gscrib = "vpype_gscrib.vpype_gscrib:vpype_gscrib"

pyproject.toml

@@ -1,4 +1,5 @@
 mock~=5.2.0
-pre-commit~=4.1.0
-pylint~=3.3.0
-pytest~=8.3.0
+pre-commit~=4.2.0
+pylint~=3.3.7
+pytest~=8.4.1
+tox~=4.32.0

requirements.dev.txt

@@ -1,9 +1,9 @@
-gscrib~=1.1.0
-numpy~=2.2.0
-opencv-python~=4.11.0
-pydantic~=2.10.0
-pyserial~=3.5.0
-scikit-image~=0.25.0
-scipy~=1.15.0
-typeguard~=4.4.0
-vpype~=1.14.0
+gscrib>=1.2.0,<2.0
+numpy>=2.0.0,<3
+opencv-python>=4.10.0,<5.0
+pydantic>=2.8.0,<3.0
+pyserial>=3.5.0,<4.0
+scikit-image>=0.23.0,<1.0
+scipy>=1.14.0,<2.0
+typeguard>=4.3.0,<5.0
+vpype>=1.14.0,<2.0

requirements.txt

@@ -2,13 +2,13 @@
 from unittest.mock import Mock, MagicMock, patch
 from dataclasses import FrozenInstanceError
 from gscrib import GCodeBuilder
-from vpype_gscrib.heightmaps import FlatHeightMap
-from vpype_gscrib.heightmaps import SparseHeightMap
-from vpype_gscrib.heightmaps import RasterHeightMap
+from gscrib.enums import LengthUnits
+from gscrib.heightmaps import BaseHeightMap
+from gscrib.heightmaps import FlatHeightMap
+from gscrib.heightmaps import SparseHeightMap
+from gscrib.heightmaps import RasterHeightMap
 from vpype_gscrib.renderer import GContext
 from vpype_gscrib.config import RenderConfig
-from gscrib.enums import LengthUnits
-from vpype_gscrib.heightmaps import BaseHeightMap
 
 
 # --------------------------------------------------------------------
@@ -93,7 +93,7 @@ def test_height_map_no_path(mock_gbuilder, render_config):
     context = GContext(mock_gbuilder, render_config)
     assert isinstance(context._height_map, FlatHeightMap)
 
-@patch("vpype_gscrib.heightmaps.SparseHeightMap.from_path")
+@patch("gscrib.heightmaps.SparseHeightMap.from_path")
 def test_build_height_map_sparse(from_path, mock_gbuilder, render_config):
     heightmap = MagicMock(spec=SparseHeightMap)
     from_path.return_value = heightmap
@@ -105,7 +105,7 @@ def test_build_height_map_sparse(from_path, mock_gbuilder, render_config):
     heightmap.set_tolerance.assert_called_with(tolerance)
     heightmap.set_scale.assert_called_with(scale)
 
-@patch("vpype_gscrib.heightmaps.RasterHeightMap.from_path")
+@patch("gscrib.heightmaps.RasterHeightMap.from_path")
 def test_build_height_map_raster(from_path, mock_gbuilder, render_config):
     heightmap = MagicMock(spec=RasterHeightMap)
     from_path.return_value = heightmap