svg-ultralight 0.24.0__tar.gz → 0.26.0__tar.gz

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg-ultralight
-Version: 0.24.0
+Version: 0.26.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "svg-ultralight"
-version = "0.24.0"
+version = "0.26.0"
 description = "a sensible way to create svg files with Python"
 authors = [{ name = "Shay Hill", email = "shay_public@hotmail.com" }]
 license = { text = "MIT" }
@@ -33,7 +33,7 @@ legacy_tox_ini = """
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.24.0"
+version = "0.26.0"
 tag_format = "$version"
 version_files = ["pyproject.toml:^version"]
 annotated_tag = true

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/src/svg_ultralight/__init__.py

@@ -26,7 +26,11 @@ from svg_ultralight.metadata import new_metadata
 from svg_ultralight.nsmap import NSMAP, new_qname
 from svg_ultralight.query import pad_text
 from svg_ultralight.root_elements import new_svg_root_around_bounds
-from svg_ultralight.string_conversion import format_number, format_numbers
+from svg_ultralight.string_conversion import (
+    format_number,
+    format_numbers,
+    format_numbers_in_string,
+)
 
 __all__ = [
     "BoundElement",
@@ -37,6 +41,7 @@ __all__ = [
     "deepcopy_element",
     "format_number",
     "format_numbers",
+    "format_numbers_in_string",
     "new_element",
     "new_metadata",
     "new_qname",

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/src/svg_ultralight/bounding_boxes/type_bounding_box.py

@@ -6,7 +6,6 @@
 
 from __future__ import annotations
 
-import warnings
 from dataclasses import dataclass
 
 from svg_ultralight.bounding_boxes.supports_bounds import SupportsBounds
@@ -286,12 +285,6 @@ class BoundingBox(SupportsBounds):
         :return: a bounding box around self and other bounding boxes
         :raises DeprecationWarning:
         """
-        warnings.warn(
-            "Method a.merge(b, c) is deprecated. "
-            + "Use classmethod BoundingBox.merged(a, b, c) instead.",
-            category=DeprecationWarning,
-            stacklevel=1,
-        )
         return BoundingBox.merged(self, *others)
 
     @classmethod

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/src/svg_ultralight/string_conversion.py

@@ -11,6 +11,7 @@ Rounding some numbers to ensure quality svg rendering:
 from __future__ import annotations
 
 import re
+from contextlib import suppress
 from enum import Enum
 from typing import TYPE_CHECKING, cast
 
@@ -71,15 +72,26 @@ def _is_float_or_float_str(data: float | str) -> bool:
         return True
 
 
-def _format_datastring(data: str) -> str:
+def format_numbers_in_string(data: float | str) -> str:
     """Find and format floats in a string.
 
-    :param data: string with floats
+    :param data: string with floats or a float value
     :return: string with floats formatted to limited precision
 
-    Will correctly handle input floats in exponential notation.
+    Works as a more robust version of format_number. Will correctly handle input
+    floats in exponential notation. This should work for any parameter value in an
+    svg except 'text', 'id' and for any other value except hex color codes. The
+    function will fail with input strings like 'ice3.14bucket', because 'e3.14' will
+    be identified as a float. SVG param values will not have such strings, but the
+    'text' attribute could. This function will not handle that case. Do not attempt
+    to reformat 'text' attribute values.
     """
-    words = re.split(r"([^\d.eE-]+)", data)
+    with suppress(ValueError):
+        # try as a regular number to strip spaces from simple float strings
+        return format_number(data)
+    if str(data).startswith("#"):
+        return str(data)
+    words = re.split(r"([^\d.eE-]+)", str(data))
     words = [format_number(w) if _is_float_or_float_str(w) else w for w in words]
     return "".join(words)
 
@@ -114,15 +126,10 @@ def _fix_key_and_format_val(key: str, val: str | float) -> tuple[str, str]:
     else:
         key_ = key.rstrip("_").replace("_", "-")
 
-    if key_ == "d":
-        if isinstance(val, str):
-            return key_, _format_datastring(val)
-        msg = f"Expected string for 'd' attribute, got {val} of type {type(val)}"
-        raise ValueError(msg)
+    if key_ in {"id", "text"}:
+        return key_, str(val)
 
-    if _is_float_or_float_str(val) and key_ != "text":
-        return key_, format_number(val)
-    return key_, str(val)
+    return key_, format_numbers_in_string(val)
 
 
 def format_attr_dict(**attributes: str | float) -> dict[str, str]:

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/src/svg_ultralight.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: svg-ultralight
-Version: 0.24.0
+Version: 0.26.0
 Summary: a sensible way to create svg files with Python
 Author-email: Shay Hill <shay_public@hotmail.com>
 License: MIT

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/src/svg_ultralight.egg-info/SOURCES.txt

@@ -1,6 +1,5 @@
 .pre-commit-config.yaml
 README.md
-dev-requirements.txt
 pyproject.toml
 tox.ini
 src/svg_ultralight/__init__.py

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/tests/test_queries.py

@@ -28,12 +28,6 @@ if not INKSCAPE.with_suffix(".exe").exists():
 
 
 class TestMergeBoundingBoxes:
-    def test_merge_deprecation_warning(self):
-        bbox_a = BoundingBox(-2, -4, 10, 20)
-        bbox_b = BoundingBox(0, 0, 10, 10)
-        assert pytest.warns(DeprecationWarning, BoundingBox.merge, bbox_a, bbox_b)
-        with pytest.warns(DeprecationWarning):
-            assert bbox_a.merge(bbox_b) == BoundingBox.merged(bbox_a, bbox_b)
 
     def test_new_merged_bbox(self):
         bbox_a = BoundingBox(-2, -4, 10, 20)

{svg-ultralight-0.24.0 → svg_ultralight-0.26.0}/tests/test_string_conversion.py

@@ -4,7 +4,7 @@
 :created: 2023-09-23
 """
 
-import pytest
+# pyright: reportPrivateUsage=false
 
 import svg_ultralight.string_conversion as mod
 
@@ -29,6 +29,36 @@ class TestFormatNumbers:
         assert mod.format_numbers([1, 2, 3]) == ["1", "2", "3"]
 
 
+class TestFormatNumbersInString:
+    def test_empty(self):
+        """Return empty string."""
+        assert mod.format_numbers_in_string("") == ""
+
+    def test_no_numbers(self):
+        """Return string with no changes."""
+        assert mod.format_numbers_in_string("hello") == "hello"
+
+    def test_numbers(self):
+        """Return string with numbers formatted."""
+        assert mod.format_numbers_in_string("1.0000000001") == "1"
+
+    def test_skip_text(self):
+        """Skip text."""
+        key = "text"
+        val = "1.000000000000000000"
+        assert mod._fix_key_and_format_val(key, val) == (key, val)
+
+    def test_skip_id(self):
+        """Skip text."""
+        key = "id"
+        val = "1.000000000000000000"
+        assert mod._fix_key_and_format_val(key, val) == (key, val)
+
+    def test_skip_hex_colors(self):
+        """Skip hex colors."""
+        assert mod.format_numbers_in_string("#000000") == "#000000"
+
+
 class TestFormatAttrDict:
     def test_float(self):
         """Return string of float."""
@@ -58,9 +88,11 @@ class TestFormatAttrDict:
             "d": "M1,0 Q 0,0.333333 1,2z"
         }
 
-    def test_invalid_datastring(self):
-        """Raise ValueError if d value is not a string."""
-        assert pytest.raises(ValueError, mod.format_attr_dict, d=1)
+    def test_format_string(self):
+        """Format floats in a format SVG attribute string."""
+        assert mod.format_attr_dict(
+            transform="translate(1.0, -0) scale(1.0, 1.0)"
+        ) == {"transform": "translate(1, 0) scale(1, 1)"}
 
     def test_trailing_underscore(self):
         """Remove trailing underscore from key."""

svg-ultralight-0.24.0/dev-requirements.txt

@@ -1,102 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.12
-# by the following command:
-#
-#    pip-compile --extra=dev --output-file=dev-requirements.txt --strip-extras pyproject.toml
-#
-argcomplete==3.2.3
-    # via commitizen
-cachetools==5.3.3
-    # via tox
-cfgv==3.4.0
-    # via pre-commit
-chardet==5.2.0
-    # via tox
-charset-normalizer==3.3.2
-    # via commitizen
-colorama==0.4.6
-    # via
-    #   commitizen
-    #   pytest
-    #   tox
-commitizen==3.20.0
-    # via svg-ultralight (pyproject.toml)
-decli==0.6.1
-    # via commitizen
-distlib==0.3.8
-    # via virtualenv
-filelock==3.13.1
-    # via
-    #   tox
-    #   virtualenv
-identify==2.5.35
-    # via pre-commit
-importlib-metadata==7.0.2
-    # via commitizen
-iniconfig==2.0.0
-    # via pytest
-jinja2==3.1.3
-    # via commitizen
-lxml==5.1.0
-    # via svg-ultralight (pyproject.toml)
-markupsafe==2.1.5
-    # via jinja2
-nodeenv==1.8.0
-    # via pre-commit
-packaging==24.0
-    # via
-    #   commitizen
-    #   pyproject-api
-    #   pytest
-    #   tox
-paragraphs==0.2.0
-    # via svg-ultralight (pyproject.toml)
-pillow==10.2.0
-    # via svg-ultralight (pyproject.toml)
-platformdirs==4.2.0
-    # via
-    #   tox
-    #   virtualenv
-pluggy==1.4.0
-    # via
-    #   pytest
-    #   tox
-pre-commit==3.6.2
-    # via svg-ultralight (pyproject.toml)
-prompt-toolkit==3.0.36
-    # via questionary
-pyproject-api==1.6.1
-    # via tox
-pytest==8.1.1
-    # via svg-ultralight (pyproject.toml)
-pyyaml==6.0.1
-    # via
-    #   commitizen
-    #   pre-commit
-questionary==2.0.1
-    # via commitizen
-termcolor==2.4.0
-    # via commitizen
-tomlkit==0.12.4
-    # via commitizen
-tox==4.14.1
-    # via svg-ultralight (pyproject.toml)
-types-beautifulsoup4==4.12.0.20240229
-    # via types-lxml
-types-html5lib==1.1.11.20240228
-    # via types-beautifulsoup4
-types-lxml==2024.2.9
-    # via svg-ultralight (pyproject.toml)
-typing-extensions==4.10.0
-    # via types-lxml
-virtualenv==20.25.1
-    # via
-    #   pre-commit
-    #   tox
-wcwidth==0.2.13
-    # via prompt-toolkit
-zipp==3.18.1
-    # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools