Merge pull request #134 from dankicode/master

update dependencies to swap in cytriangle and update references to tr…
robbievanleeuwen · Sep 13, 2024 · 5674681 · 5674681
2 parents a5f174c + ff36b13
commit 5674681
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 55 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -25,6 +25,10 @@ jobs:
           - { python: "3.11", os: "windows-latest", session: "tests" }
           - { python: "3.10", os: "windows-latest", session: "tests" }
           - { python: "3.9", os: "windows-latest", session: "tests" }
+          - { python: "3.12", os: "macos-latest", session: "tests" }
+          - { python: "3.11", os: "macos-latest", session: "tests" }
+          - { python: "3.10", os: "macos-latest", session: "tests" }
+          - { python: "3.9", os: "macos-latest", session: "tests" }
           - { python: "3.12", os: "macos-13", session: "tests" }
           - { python: "3.11", os: "macos-13", session: "tests" }
           - { python: "3.10", os: "macos-13", session: "tests" }

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -10,7 +10,7 @@ Installing ``concreteproperties``
 ---------------------------------
 
 ``concreteproperties`` uses `shapely <https://github.com/shapely/shapely>`_ to prepare
-the cross-section geometry and `triangle <https://github.com/drufat/triangle>`_ to
+the cross-section geometry and `CyTriangle <https://github.com/m-clare/cytriangle>`_ to
 efficiently generate a conforming triangular mesh.
 `sectionproperties <https://github.com/robbievanleeuwen/section-properties>`_ is used to
 generate concrete geometries, while `numpy <https://github.com/numpy/numpy>`_ and

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -50,11 +50,11 @@ numpy = "^1.26.4"
 scipy = "^1.12.0"
 matplotlib = "^3.8.3"
 shapely = "^2.0.3"
-triangle = "^20230923"
+cytriangle = "^1.0.2"
 rich = "^13.7.1"
 click = "^8.1.7"
 more-itertools = "^10.2.0"
-sectionproperties = "^3.2.2"
+sectionproperties = "^3.3.0"
 
 [tool.poetry.dev-dependencies]
 black = "^24.2.0"

diff --git a/src/concreteproperties/analysis_section.py b/src/concreteproperties/analysis_section.py
@@ -6,8 +6,8 @@
 from math import isinf
 from typing import TYPE_CHECKING
 
+import cytriangle as triangle
 import numpy as np
-import triangle
 from matplotlib.colors import ListedColormap
 
 import concreteproperties.utils as utils