diff --git a/pyproject.toml b/pyproject.toml index 6a163314..bd2adbd6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -77,7 +77,7 @@ docs = [ ] lint = [ "pre-commit==4.1.0", - "pyright==1.1.389", + "pyright==1.1.396", ] test = [ "pytest==8.3.5", diff --git a/src/sectionproperties/pre/geometry.py b/src/sectionproperties/pre/geometry.py index c0a61b33..a3a2752f 100644 --- a/src/sectionproperties/pre/geometry.py +++ b/src/sectionproperties/pre/geometry.py @@ -428,13 +428,13 @@ def create_facets_and_control_points(self) -> None: ) if not self.assigned_control_point: - self.control_points = list(self.geom.representative_point().coords) + self.control_points = list(self.geom.representative_point().coords) # pyright: ignore [reportAttributeAccessIssue] else: - self.control_points = list(self.assigned_control_point.coords) + self.control_points = list(self.assigned_control_point.coords) # pyright: ignore [reportAttributeAccessIssue] for hole in self.geom.interiors: hole_polygon = Polygon(hole) - self.holes += tuple(hole_polygon.representative_point().coords) + self.holes += tuple(hole_polygon.representative_point().coords) # pyright: ignore [reportOperatorIssue] def compile_geometry(self) -> None: """Alias for ``create_facets_and_control_points()``. @@ -697,9 +697,10 @@ def shift_section( new_ctrl_point: tuple[float, float] | None = None if self.assigned_control_point: - new_ctrl_point = affinity.translate( + new_ctrl_point_geom = affinity.translate( self.assigned_control_point, x_offset, y_offset - ).coords[0] + ) + new_ctrl_point = new_ctrl_point_geom.x, new_ctrl_point_geom.y return Geometry( geom=affinity.translate(self.geom, x_offset, y_offset), @@ -751,12 +752,13 @@ def rotate_section( else: rotate_point = rot_point - new_ctrl_point = affinity.rotate( + new_ctrl_point_geom = affinity.rotate( self.assigned_control_point, angle, rotate_point, # pyright: ignore [reportArgumentType] use_radians, - ).coords[0] + ) + new_ctrl_point = new_ctrl_point_geom.x, new_ctrl_point_geom.y return Geometry( geom=affinity.rotate(self.geom, angle, rot_point, use_radians), # pyright: ignore [reportArgumentType] @@ -821,13 +823,14 @@ def mirror_section( new_ctrl_point: tuple[float, float] | None = None if self.assigned_control_point: - new_ctrl_point = affinity.scale( + new_ctrl_point_geom = affinity.scale( self.assigned_control_point, xfact=y_mirror, yfact=x_mirror, zfact=1.0, origin=mirror_point, # pyright: ignore [reportArgumentType] - ).coords[0] + ) + new_ctrl_point = new_ctrl_point_geom.x, new_ctrl_point_geom.y return Geometry( geom=mirrored_geom, @@ -1270,7 +1273,7 @@ def calculate_centroid(self) -> tuple[float, float]: Returns: Geometry centroid """ - return self.geom.centroid.coords[0] + return self.geom.centroid.x, self.geom.centroid.y @property def recovery_points(self) -> list[tuple[float, float]] | list[Point]: @@ -2443,7 +2446,7 @@ def compile_geometry(self) -> None: for interior in poly.interiors: rp: Point = Polygon(interior).representative_point() coords = rp.coords[0] - resultant_holes.append(coords) + resultant_holes.append(coords) # pyright: ignore [reportArgumentType] elif isinstance(unionized_poly, Polygon): # pyright: ignore [reportUnnecessaryIsInstance] if Geometry(unionized_poly).holes: diff --git a/uv.lock b/uv.lock index 0860c55f..d949376b 100644 --- a/uv.lock +++ b/uv.lock @@ -1594,15 +1594,15 @@ wheels = [ [[package]] name = "pyright" -version = "1.1.389" +version = "1.1.396" source = { registry = "https://pypi.org/simple" } dependencies = [ { name = "nodeenv" }, { name = "typing-extensions" }, ] -sdist = { url = "https://files.pythonhosted.org/packages/72/4e/9a5ab8745e7606b88c2c7ca223449ac9d82a71fd5e31df47b453f2cb39a1/pyright-1.1.389.tar.gz", hash = "sha256:716bf8cc174ab8b4dcf6828c3298cac05c5ed775dda9910106a5dcfe4c7fe220", size = 21940 } +sdist = { url = "https://files.pythonhosted.org/packages/bd/73/f20cb1dea1bdc1774e7f860fb69dc0718c7d8dea854a345faec845eb086a/pyright-1.1.396.tar.gz", hash = "sha256:142901f5908f5a0895be3d3befcc18bedcdb8cc1798deecaec86ef7233a29b03", size = 3814400 } wheels = [ - { url = "https://files.pythonhosted.org/packages/1b/26/c288cabf8cfc5a27e1aa9e5029b7682c0f920b8074f45d22bf844314d66a/pyright-1.1.389-py3-none-any.whl", hash = "sha256:41e9620bba9254406dc1f621a88ceab5a88af4c826feb4f614d95691ed243a60", size = 18581 }, + { url = "https://files.pythonhosted.org/packages/80/be/ecb7cfb42d242b7ee764b52e6ff4782beeec00e3b943a3ec832b281f9da6/pyright-1.1.396-py3-none-any.whl", hash = "sha256:c635e473095b9138c471abccca22b9fedbe63858e0b40d4fc4b67da041891844", size = 5689355 }, ] [[package]] @@ -2006,7 +2006,7 @@ docs = [ ] lint = [ { name = "pre-commit", specifier = "==4.1.0" }, - { name = "pyright", specifier = "==1.1.389" }, + { name = "pyright", specifier = "==1.1.396" }, ] test = [ { name = "coverage", extras = ["toml"], specifier = "==7.6.12" },