Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.9.9
rev: v0.11.7
hooks:
- id: ruff
args: [--fix]
Expand Down
20 changes: 10 additions & 10 deletions src/sectionproperties/analysis/section.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from rich.console import Console
from rich.live import Live
from rich.panel import Panel
from rich.progress import Progress, TaskID
from rich.table import Table
from scipy.sparse import coo_matrix, csc_matrix
from scipy.sparse.linalg import LinearOperator, spilu
Expand All @@ -37,6 +36,7 @@
from collections.abc import Callable

import matplotlib.axes
from rich.progress import Progress, TaskID


class Section:
Expand Down Expand Up @@ -456,7 +456,7 @@ def warping_analysis(progress: Progress | None = None) -> None:
msg = f"[green]:white_check_mark: {self.num_nodes}x{self.num_nodes} "
msg += "stiffness matrix assembled"
progress.update(task_id=task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
k_lg, f_torsion = warping_section.assemble_torsion()

Expand Down Expand Up @@ -516,7 +516,7 @@ def solve_warping() -> npt.NDArray[np.float64]:
msg = "[green]:white_check_mark: Warping function solved "
msg += f"({solver_type})"
progress.update(task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
omega = solve_warping()

Expand Down Expand Up @@ -565,7 +565,7 @@ def assemble_shear_load(

msg = "[green]:white_check_mark: Shear function vectors assembled"
progress.update(task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
f_psi, f_phi = assemble_shear_load()

Expand Down Expand Up @@ -613,7 +613,7 @@ def solve_shear_functions(
msg = "[green]:white_check_mark: Shear functions solved "
msg += f"({solver_type})"
progress.update(task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
psi_shear, phi_shear = solve_shear_functions()

Expand Down Expand Up @@ -676,7 +676,7 @@ def assemble_sc_warping_integrals(

msg = "[green]:white_check_mark: Shear and warping integrals assembled"
progress.update(task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
(
sc_xint,
Expand Down Expand Up @@ -754,7 +754,7 @@ def assemble_shear_deformation(
msg = "[green]:white_check_mark: Shear deformation coefficients "
msg += "assembled"
progress.update(task_id=task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
kappa_x, kappa_y, kappa_xy = assemble_shear_deformation()

Expand Down Expand Up @@ -825,7 +825,7 @@ def calculate_monosymmetry_integrals(

msg = "[green]:white_check_mark: Monosymmetry integrals assembled"
progress.update(task_id=task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
int_x, int_y, int_11, int_22 = calculate_monosymmetry_integrals()

Expand Down Expand Up @@ -1037,7 +1037,7 @@ def warping_analysis(progress: Progress | None = None) -> None:
msg = f"[green]:white_check_mark: {self.num_nodes}x{self.num_nodes} "
msg += "stiffness matrix assembled"
progress.update(task_id=task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
k_lg, f_torsion = warping_section.assemble_torsion()

Expand Down Expand Up @@ -1097,7 +1097,7 @@ def solve_warping() -> npt.NDArray[np.float64]:
msg = "[green]:white_check_mark: Warping function solved "
msg += f"({solver_type})"
progress.update(task, description=msg)
progress.update(cast(TaskID, 0), advance=1)
progress.update(cast("TaskID", 0), advance=1)
else:
omega = solve_warping()

Expand Down
4 changes: 2 additions & 2 deletions src/sectionproperties/pre/geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -2580,7 +2580,7 @@ def create_exterior_points(
List of exterior points
"""
return cast(
list[tuple[float, float]], [tuple(coord) for coord in shape.exterior.coords]
"list[tuple[float, float]]", [tuple(coord) for coord in shape.exterior.coords]
)


Expand All @@ -2598,7 +2598,7 @@ def create_interior_points(
Returns:
List of interior points
"""
return cast(list[tuple[float, float]], [tuple(coord) for coord in lr.coords])
return cast("list[tuple[float, float]]", [tuple(coord) for coord in lr.coords])


def create_points_and_facets(
Expand Down