Skip to content

Commit 5674681

Browse files
Merge pull request #134 from dankicode/master
update dependencies to swap in cytriangle and update references to tr…
2 parents a5f174c + ff36b13 commit 5674681

File tree

5 files changed

+43
-55
lines changed

5 files changed

+43
-55
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ jobs:
2525
- { python: "3.11", os: "windows-latest", session: "tests" }
2626
- { python: "3.10", os: "windows-latest", session: "tests" }
2727
- { python: "3.9", os: "windows-latest", session: "tests" }
28+
- { python: "3.12", os: "macos-latest", session: "tests" }
29+
- { python: "3.11", os: "macos-latest", session: "tests" }
30+
- { python: "3.10", os: "macos-latest", session: "tests" }
31+
- { python: "3.9", os: "macos-latest", session: "tests" }
2832
- { python: "3.12", os: "macos-13", session: "tests" }
2933
- { python: "3.11", os: "macos-13", session: "tests" }
3034
- { python: "3.10", os: "macos-13", session: "tests" }

docs/installation.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Installing ``concreteproperties``
1010
---------------------------------
1111

1212
``concreteproperties`` uses `shapely <https://github.com/shapely/shapely>`_ to prepare
13-
the cross-section geometry and `triangle <https://github.com/drufat/triangle>`_ to
13+
the cross-section geometry and `CyTriangle <https://github.com/m-clare/cytriangle>`_ to
1414
efficiently generate a conforming triangular mesh.
1515
`sectionproperties <https://github.com/robbievanleeuwen/section-properties>`_ is used to
1616
generate concrete geometries, while `numpy <https://github.com/numpy/numpy>`_ and

poetry.lock

Lines changed: 35 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ numpy = "^1.26.4"
5050
scipy = "^1.12.0"
5151
matplotlib = "^3.8.3"
5252
shapely = "^2.0.3"
53-
triangle = "^20230923"
53+
cytriangle = "^1.0.2"
5454
rich = "^13.7.1"
5555
click = "^8.1.7"
5656
more-itertools = "^10.2.0"
57-
sectionproperties = "^3.2.2"
57+
sectionproperties = "^3.3.0"
5858

5959
[tool.poetry.dev-dependencies]
6060
black = "^24.2.0"

src/concreteproperties/analysis_section.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from math import isinf
77
from typing import TYPE_CHECKING
88

9+
import cytriangle as triangle
910
import numpy as np
10-
import triangle
1111
from matplotlib.colors import ListedColormap
1212

1313
import concreteproperties.utils as utils

0 commit comments

Comments
 (0)