diff --git a/src/specklepy/objects/geometry/arc.py b/src/specklepy/objects/geometry/arc.py index ff4fc382..46f8cb42 100644 --- a/src/specklepy/objects/geometry/arc.py +++ b/src/specklepy/objects/geometry/arc.py @@ -1,9 +1,9 @@ -from dataclasses import dataclass import math +from dataclasses import dataclass from specklepy.objects.base import Base -from specklepy.objects.geometry.point import Point from specklepy.objects.geometry.plane import Plane +from specklepy.objects.geometry.point import Point from specklepy.objects.interfaces import ICurve, IHasUnits diff --git a/src/specklepy/objects/geometry/line.py b/src/specklepy/objects/geometry/line.py index a6d41614..0812d8ed 100644 --- a/src/specklepy/objects/geometry/line.py +++ b/src/specklepy/objects/geometry/line.py @@ -1,9 +1,8 @@ -from dataclasses import dataclass, field +from dataclasses import dataclass from specklepy.objects.base import Base from specklepy.objects.geometry.point import Point from specklepy.objects.interfaces import ICurve, IHasUnits -from specklepy.objects.primitive import Interval @dataclass(kw_only=True) diff --git a/src/specklepy/objects/geometry/mesh.py b/src/specklepy/objects/geometry/mesh.py index 14a51dd2..a7231ffd 100644 --- a/src/specklepy/objects/geometry/mesh.py +++ b/src/specklepy/objects/geometry/mesh.py @@ -3,7 +3,7 @@ from specklepy.objects.base import Base from specklepy.objects.geometry.point import Point -from specklepy.objects.interfaces import IHasArea, IHasVolume, IHasUnits +from specklepy.objects.interfaces import IHasArea, IHasUnits, IHasVolume @dataclass(kw_only=True) diff --git a/src/specklepy/objects/geometry/point.py b/src/specklepy/objects/geometry/point.py index 36bf399d..3288188f 100644 --- a/src/specklepy/objects/geometry/point.py +++ b/src/specklepy/objects/geometry/point.py @@ -1,14 +1,7 @@ from dataclasses import dataclass -from typing import List, Tuple, Any from specklepy.objects.base import Base from specklepy.objects.interfaces import IHasUnits -from specklepy.objects.models.units import ( - Units, - get_scale_factor, - get_units_from_string, - get_encoding_from_units -) @dataclass(kw_only=True) diff --git a/src/specklepy/objects/primitive.py b/src/specklepy/objects/primitive.py index c6a6f491..89f1ee0b 100644 --- a/src/specklepy/objects/primitive.py +++ b/src/specklepy/objects/primitive.py @@ -1,5 +1,4 @@ from dataclasses import dataclass -from typing import List from specklepy.objects.base import Base diff --git a/src/specklepy/objects/tests/test_arc.py b/src/specklepy/objects/tests/test_arc.py index 6cad3f56..e60f8a36 100644 --- a/src/specklepy/objects/tests/test_arc.py +++ b/src/specklepy/objects/tests/test_arc.py @@ -1,12 +1,11 @@ +import math + import pytest -from specklepy.objects.geometry import Arc -from specklepy.objects.geometry import Point -from specklepy.objects.geometry import Plane -from specklepy.objects.geometry import Vector -from specklepy.objects.primitive import Interval + +from specklepy.core.api.operations import deserialize, serialize +from specklepy.objects.geometry import Arc, Plane, Point, Vector from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize -import math +from specklepy.objects.primitive import Interval @pytest.fixture diff --git a/src/specklepy/objects/tests/test_line.py b/src/specklepy/objects/tests/test_line.py index 6e28ef55..ff8a42dc 100644 --- a/src/specklepy/objects/tests/test_line.py +++ b/src/specklepy/objects/tests/test_line.py @@ -1,9 +1,9 @@ import pytest -from specklepy.objects.geometry import Line -from specklepy.objects.geometry import Point -from specklepy.objects.primitive import Interval + +from specklepy.core.api.operations import deserialize, serialize +from specklepy.objects.geometry import Line, Point from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize +from specklepy.objects.primitive import Interval @pytest.fixture diff --git a/src/specklepy/objects/tests/test_mesh.py b/src/specklepy/objects/tests/test_mesh.py index 9f62031a..90a6817a 100644 --- a/src/specklepy/objects/tests/test_mesh.py +++ b/src/specklepy/objects/tests/test_mesh.py @@ -1,8 +1,9 @@ import pytest + +from specklepy.core.api.operations import deserialize, serialize from specklepy.objects.geometry.mesh import Mesh from specklepy.objects.geometry.point import Point from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize @pytest.fixture diff --git a/src/specklepy/objects/tests/test_plane.py b/src/specklepy/objects/tests/test_plane.py index 1fb0346f..99197b5f 100644 --- a/src/specklepy/objects/tests/test_plane.py +++ b/src/specklepy/objects/tests/test_plane.py @@ -1,9 +1,8 @@ import pytest -from specklepy.objects.geometry import Plane -from specklepy.objects.geometry import Point -from specklepy.objects.geometry import Vector + +from specklepy.core.api.operations import deserialize, serialize +from specklepy.objects.geometry import Plane, Point, Vector from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize @pytest.fixture diff --git a/src/specklepy/objects/tests/test_point.py b/src/specklepy/objects/tests/test_point.py index 4332f2de..8622813d 100644 --- a/src/specklepy/objects/tests/test_point.py +++ b/src/specklepy/objects/tests/test_point.py @@ -1,7 +1,8 @@ import pytest + +from specklepy.core.api.operations import deserialize, serialize from specklepy.objects.geometry import Point from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize def test_point_creation(): diff --git a/src/specklepy/objects/tests/test_polyline.py b/src/specklepy/objects/tests/test_polyline.py index ca69f142..63e3965c 100644 --- a/src/specklepy/objects/tests/test_polyline.py +++ b/src/specklepy/objects/tests/test_polyline.py @@ -1,9 +1,9 @@ import pytest -from specklepy.objects.geometry import Polyline -from specklepy.objects.geometry import Point -from specklepy.objects.primitive import Interval + +from specklepy.core.api.operations import deserialize, serialize +from specklepy.objects.geometry import Point, Polyline from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize +from specklepy.objects.primitive import Interval @pytest.fixture @@ -89,7 +89,7 @@ def test_polyline_get_points(sample_polyline): ] # Check coordinates match - for actual, expected in zip(points, expected_points): + for actual, expected in zip(points, expected_points, strict=False): assert actual.x == expected.x assert actual.y == expected.y assert actual.z == expected.z diff --git a/src/specklepy/objects/tests/test_vector.py b/src/specklepy/objects/tests/test_vector.py index fbaf74fc..c20b0880 100644 --- a/src/specklepy/objects/tests/test_vector.py +++ b/src/specklepy/objects/tests/test_vector.py @@ -1,7 +1,8 @@ import pytest + +from specklepy.core.api.operations import deserialize, serialize from specklepy.objects.geometry import Vector from specklepy.objects.models.units import Units -from specklepy.core.api.operations import serialize, deserialize def test_vector_creation(): diff --git a/uv.lock b/uv.lock index a074e3a0..619d18c2 100644 --- a/uv.lock +++ b/uv.lock @@ -996,7 +996,7 @@ wheels = [ [[package]] name = "specklepy" -version = "2.21.3.dev41+g17cbcc3.d20250121" +version = "2.21.3.dev55+gd25f30b.d20250122" source = { editable = "." } dependencies = [ { name = "appdirs" },