Skip to content

Commit b7ee91e

Browse files
Merge pull request #403 from robbievanleeuwen/update-dependencies
Update dependencies
2 parents e913ea7 + b87519d commit b7ee91e

38 files changed

+1019
-960
lines changed

.pre-commit-config.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,21 @@ repos:
6262
types: [text]
6363
stages: [commit, push, manual]
6464
- repo: https://github.com/pre-commit/mirrors-prettier
65-
rev: v3.0.3
65+
rev: v3.1.0
6666
hooks:
6767
- id: prettier
6868
- repo: https://github.com/kynan/nbstripout
69-
rev: 0.6.1
69+
rev: 0.7.1
7070
hooks:
7171
- id: nbstripout
7272
- repo: https://github.com/nbQA-dev/nbQA
73-
rev: 1.7.0
73+
rev: 1.8.4
7474
hooks:
7575
- id: nbqa-black
76-
additional_dependencies: [black==23.12.0]
76+
additional_dependencies: [black==24.2.0]
7777
- id: nbqa-pyupgrade
78-
additional_dependencies: [pyupgrade==3.15.0]
78+
additional_dependencies: [pyupgrade==3.15.1]
7979
args: ["--py39-plus"]
8080
- id: nbqa-isort
81-
additional_dependencies: [isort==5.12.0]
81+
additional_dependencies: [isort==5.13.2]
8282
args: [--profile=black]

docs/examples/advanced/advanced_plot.ipynb

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@
22
"cells": [
33
{
44
"cell_type": "markdown",
5-
"id": "27576f1d",
5+
"id": "0",
66
"metadata": {},
77
"source": [
88
"# Advanced Plotting"
99
]
1010
},
1111
{
1212
"cell_type": "markdown",
13-
"id": "e5f5821a-5b0e-4195-88b3-f8aad0e6ae2c",
13+
"id": "1",
1414
"metadata": {},
1515
"source": [
1616
"All plots in `sectionproperties` allow keyword arguments to be passed to [plotting_context()](../..//gen/sectionproperties.post.post.plotting_context.rst#sectionproperties.post.post.plotting_context). This example shows one application of using the `plotting_context()` to generate a custom plot in a 2 x 2 arrangement."
1717
]
1818
},
1919
{
2020
"cell_type": "markdown",
21-
"id": "c4ed61cc-ab12-4e60-aa51-b5e0f52160c8",
21+
"id": "2",
2222
"metadata": {},
2323
"source": [
2424
"## Create Geometry and Perform Analysis"
2525
]
2626
},
2727
{
2828
"cell_type": "markdown",
29-
"id": "fbab4168-0b45-4d4e-befe-206b66e21774",
29+
"id": "3",
3030
"metadata": {},
3131
"source": [
3232
"We start by creating the geometry for a 100 x 6 SHS."
@@ -35,7 +35,7 @@
3535
{
3636
"cell_type": "code",
3737
"execution_count": null,
38-
"id": "66522637-ff51-4945-ab72-a1a354ea9e67",
38+
"id": "4",
3939
"metadata": {},
4040
"outputs": [],
4141
"source": [
@@ -47,7 +47,7 @@
4747
},
4848
{
4949
"cell_type": "markdown",
50-
"id": "ebc2c4aa-a61f-4b32-abd2-c6421b413e93",
50+
"id": "5",
5151
"metadata": {},
5252
"source": [
5353
"Next we create a mesh and a `Section` object."
@@ -56,7 +56,7 @@
5656
{
5757
"cell_type": "code",
5858
"execution_count": null,
59-
"id": "6875e793-9338-4f0f-af26-94deee9e03bd",
59+
"id": "6",
6060
"metadata": {},
6161
"outputs": [],
6262
"source": [
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"cell_type": "markdown",
72-
"id": "e9bd87c4-64f7-4fe3-8183-782559a66953",
72+
"id": "7",
7373
"metadata": {},
7474
"source": [
7575
"We can now perform a stress analysis by applying a 10 kN.m torsion (after first running the geometric and warping analysis)."
@@ -78,7 +78,7 @@
7878
{
7979
"cell_type": "code",
8080
"execution_count": null,
81-
"id": "e0be003c-b341-42aa-babc-9659bcf84e95",
81+
"id": "8",
8282
"metadata": {},
8383
"outputs": [],
8484
"source": [
@@ -89,7 +89,7 @@
8989
},
9090
{
9191
"cell_type": "markdown",
92-
"id": "af740576-9c70-4cd0-9d7d-df2fb2abd412",
92+
"id": "9",
9393
"metadata": {},
9494
"source": [
9595
"## Generate Plot\n",
@@ -100,7 +100,7 @@
100100
{
101101
"cell_type": "code",
102102
"execution_count": null,
103-
"id": "ff4d819e-45c7-4a73-92c5-9f40f8656327",
103+
"id": "10",
104104
"metadata": {},
105105
"outputs": [],
106106
"source": [

docs/examples/advanced/rectangle_torsion.ipynb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
"cells": [
33
{
44
"cell_type": "markdown",
5-
"id": "ac959a26",
5+
"id": "0",
66
"metadata": {},
77
"source": [
88
"# Torsion Constant of a Rectangle"
99
]
1010
},
1111
{
1212
"cell_type": "markdown",
13-
"id": "4dc5e9c9-cfde-413c-8d7d-ff4cab4e8fe3",
13+
"id": "1",
1414
"metadata": {},
1515
"source": [
1616
"This example shows how `sectionproperties` can be used as part of a script to conduct multiple analyses. In this example, we examine how the torsion constant varies with the aspect ratio of a rectangle section."
1717
]
1818
},
1919
{
2020
"cell_type": "markdown",
21-
"id": "9a918ccf-a17d-4813-8557-990ca96d904a",
21+
"id": "2",
2222
"metadata": {},
2323
"source": [
2424
"## Setup Analysis Parameters"
@@ -27,7 +27,7 @@
2727
{
2828
"cell_type": "code",
2929
"execution_count": null,
30-
"id": "a7ce67c7-f227-4756-83e8-1ffec6590ee0",
30+
"id": "3",
3131
"metadata": {},
3232
"outputs": [],
3333
"source": [
@@ -44,7 +44,7 @@
4444
},
4545
{
4646
"cell_type": "markdown",
47-
"id": "e03ba7bb-2971-4f92-a0f3-317a8bd52adf",
47+
"id": "4",
4848
"metadata": {},
4949
"source": [
5050
"## Analysis Loop"
@@ -53,7 +53,7 @@
5353
{
5454
"cell_type": "code",
5555
"execution_count": null,
56-
"id": "7984f360-8928-4b1c-a528-819ceca24b17",
56+
"id": "5",
5757
"metadata": {},
5858
"outputs": [],
5959
"source": [
@@ -81,7 +81,7 @@
8181
},
8282
{
8383
"cell_type": "markdown",
84-
"id": "222959a8-bab9-44a5-9f4f-67e62ab238e4",
84+
"id": "6",
8585
"metadata": {},
8686
"source": [
8787
"## Plot Results"
@@ -90,7 +90,7 @@
9090
{
9191
"cell_type": "code",
9292
"execution_count": null,
93-
"id": "79bcd59d-254d-4fd2-b6c1-99bdb17f3ad2",
93+
"id": "7",
9494
"metadata": {},
9595
"outputs": [],
9696
"source": [

docs/examples/advanced/trapezoidal_torsion.ipynb

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cells": [
33
{
44
"cell_type": "markdown",
5-
"id": "2501e180",
5+
"id": "0",
66
"metadata": {},
77
"source": [
88
"# Torsion Constant of Trapezoidal Sections\n",
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"cell_type": "markdown",
17-
"id": "bb670c58",
17+
"id": "1",
1818
"metadata": {},
1919
"source": [
2020
"## Import Modules\n",
@@ -25,7 +25,7 @@
2525
{
2626
"cell_type": "code",
2727
"execution_count": null,
28-
"id": "cdbc3de1",
28+
"id": "2",
2929
"metadata": {},
3030
"outputs": [],
3131
"source": [
@@ -40,7 +40,7 @@
4040
},
4141
{
4242
"cell_type": "markdown",
43-
"id": "884e6c68",
43+
"id": "3",
4444
"metadata": {},
4545
"source": [
4646
"## Define the Calculation Engine\n",
@@ -51,7 +51,7 @@
5151
{
5252
"cell_type": "code",
5353
"execution_count": null,
54-
"id": "2525bcef",
54+
"id": "4",
5555
"metadata": {},
5656
"outputs": [],
5757
"source": [
@@ -74,7 +74,7 @@
7474
},
7575
{
7676
"cell_type": "markdown",
77-
"id": "bf4373b9",
77+
"id": "5",
7878
"metadata": {},
7979
"source": [
8080
"## Define the Mesh Density\n",
@@ -85,7 +85,7 @@
8585
{
8686
"cell_type": "code",
8787
"execution_count": null,
88-
"id": "28b022ea",
88+
"id": "6",
8989
"metadata": {},
9090
"outputs": [],
9191
"source": [
@@ -94,7 +94,7 @@
9494
},
9595
{
9696
"cell_type": "markdown",
97-
"id": "4a652cb4",
97+
"id": "7",
9898
"metadata": {},
9999
"source": [
100100
"## Create and Analyse the Section\n",
@@ -105,7 +105,7 @@
105105
{
106106
"cell_type": "code",
107107
"execution_count": null,
108-
"id": "e89d902f",
108+
"id": "8",
109109
"metadata": {},
110110
"outputs": [],
111111
"source": [
@@ -149,7 +149,7 @@
149149
},
150150
{
151151
"cell_type": "markdown",
152-
"id": "fe6f6742",
152+
"id": "9",
153153
"metadata": {},
154154
"source": [
155155
"## Example Section\n",
@@ -160,7 +160,7 @@
160160
{
161161
"cell_type": "code",
162162
"execution_count": null,
163-
"id": "c5ed21d0",
163+
"id": "10",
164164
"metadata": {},
165165
"outputs": [],
166166
"source": [
@@ -171,7 +171,7 @@
171171
},
172172
{
173173
"cell_type": "markdown",
174-
"id": "6b3aebea",
174+
"id": "11",
175175
"metadata": {},
176176
"source": [
177177
"## Create Loop Variables\n",
@@ -182,7 +182,7 @@
182182
{
183183
"cell_type": "code",
184184
"execution_count": null,
185-
"id": "16ad7e65",
185+
"id": "12",
186186
"metadata": {},
187187
"outputs": [],
188188
"source": [
@@ -194,7 +194,7 @@
194194
},
195195
{
196196
"cell_type": "markdown",
197-
"id": "c1a772e5",
197+
"id": "13",
198198
"metadata": {},
199199
"source": [
200200
"## The Main Loop\n",
@@ -205,7 +205,7 @@
205205
{
206206
"cell_type": "code",
207207
"execution_count": null,
208-
"id": "312a2c2c",
208+
"id": "14",
209209
"metadata": {},
210210
"outputs": [],
211211
"source": [
@@ -218,7 +218,7 @@
218218
},
219219
{
220220
"cell_type": "markdown",
221-
"id": "a835afde",
221+
"id": "15",
222222
"metadata": {},
223223
"source": [
224224
"## Calculate the Ratios\n",
@@ -229,7 +229,7 @@
229229
{
230230
"cell_type": "code",
231231
"execution_count": null,
232-
"id": "e81847f1",
232+
"id": "16",
233233
"metadata": {},
234234
"outputs": [],
235235
"source": [
@@ -238,7 +238,7 @@
238238
},
239239
{
240240
"cell_type": "markdown",
241-
"id": "c4d20ab7",
241+
"id": "17",
242242
"metadata": {},
243243
"source": [
244244
"## Plot the Results\n",
@@ -249,7 +249,7 @@
249249
{
250250
"cell_type": "code",
251251
"execution_count": null,
252-
"id": "ebeda832",
252+
"id": "18",
253253
"metadata": {},
254254
"outputs": [],
255255
"source": [
@@ -289,7 +289,7 @@
289289
},
290290
{
291291
"cell_type": "markdown",
292-
"id": "13fef535",
292+
"id": "19",
293293
"metadata": {},
294294
"source": [
295295
"As expected, when the section is rectangular ``s=0``, the error is small, but as it increases towards a triangle ``s=1``, the accuracy generally reduces. However, there is an interesting line at an aspect ratio of about 2.7 where the rectangular approximation is always equal to the trapezoid’s torsion constant."

0 commit comments

Comments
 (0)