Merge branch 'master' into bump-dependencies

Author: robbievanleeuwen

.darglint

@@ -1,2 +1,3 @@
 [darglint]
 strictness = full
+ignore_regex=^test_(.*)

.flake8

@@ -1,8 +1,9 @@
 [flake8]
-select = B,B9,C,D,DAR,E,F,N,RST,S,W
+select = B,B9,C,D,DAR,E,F,N,PT,RST,S,W
 ignore = B028,B905,E203,E501,E741,RST201,RST203,RST301,RST303,W503
 max-line-length = 80
 docstring-convention = google
 per-file-ignores = tests/*:S101,__init__.py:F401,post.py:C901
 rst-roles = class,const,func,meth,mod,ref
 rst-directives = deprecated
+pytest-fixture-no-parentheses = True

.pre-commit-config.yaml

@@ -68,3 +68,14 @@ repos:
     rev: 0.6.1
     hooks:
       - id: nbstripout
+  - repo: https://github.com/nbQA-dev/nbQA
+    rev: 1.7.0
+    hooks:
+      - id: nbqa-black
+        additional_dependencies: [black==23.9.1]
+      - id: nbqa-pyupgrade
+        additional_dependencies: [pyupgrade==3.14.0]
+        args: ["--py39-plus"]
+      - id: nbqa-isort
+        additional_dependencies: [isort==5.12.0]
+        args: [--profile=black]

docs/examples/advanced/advanced_plot.ipynb

@@ -41,6 +41,7 @@
    "source": [
     "from sectionproperties.pre.library import rectangular_hollow_section\n",
     "\n",
+    "\n",
     "geom = rectangular_hollow_section(d=100, b=100, t=6, r_out=15, n_r=8)"
    ]
   },
@@ -61,6 +62,7 @@
    "source": [
     "from sectionproperties.analysis import Section\n",
     "\n",
+    "\n",
     "geom.create_mesh(mesh_sizes=[5])\n",
     "sec = Section(geometry=geom)"
    ]
@@ -104,6 +106,7 @@
    "source": [
     "import matplotlib.pyplot as plt\n",
     "\n",
+    "\n",
     "# plot the geometry\n",
     "ax = geom.plot_geometry(\n",
     "    labels=[],\n",

docs/examples/advanced/peery.ipynb

@@ -39,8 +39,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sectionproperties.pre.library import nastran_sections\n",
-    "from sectionproperties.analysis import Section"
+    "from sectionproperties.analysis import Section\n",
+    "from sectionproperties.pre.library import nastran_sections"
    ]
   },
   {

docs/examples/advanced/rectangle_torsion.ipynb

@@ -33,6 +33,7 @@
    "source": [
     "import numpy as np\n",
     "\n",
+    "\n",
     "# list of aspect ratios to analyse (10^0 = 1 to 10^1.301 = 20)\n",
     "# logspace used to concentrate data near aspect ratio = 1\n",
     "aspect_ratios = np.logspace(0, 1.301, 50)\n",
@@ -56,8 +57,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sectionproperties.pre.library import rectangular_section\n",
     "from sectionproperties.analysis import Section\n",
+    "from sectionproperties.pre.library import rectangular_section\n",
+    "\n",
     "\n",
     "for ar in aspect_ratios:\n",
     "    # calculate rectangle dimensions\n",
@@ -94,6 +96,7 @@
    "source": [
     "import matplotlib.pyplot as plt\n",
     "\n",
+    "\n",
     "_, ax = plt.subplots()\n",
     "ax.plot(aspect_ratios, torsion_constants, \"k-\")\n",
     "ax.set_xlim(0, 21)\n",

docs/examples/advanced/trapezoidal_torsion.ipynb

@@ -33,9 +33,9 @@
     "import numpy as np\n",
     "from shapely import Polygon\n",
     "\n",
+    "from sectionproperties.analysis import Section\n",
     "from sectionproperties.pre import Geometry\n",
-    "from sectionproperties.pre.library import rectangular_section, triangular_section\n",
-    "from sectionproperties.analysis import Section"
+    "from sectionproperties.pre.library import rectangular_section, triangular_section"
    ]
   },
   {

docs/examples/analysis/export_fibre_section.ipynb

@@ -36,6 +36,7 @@
     "from sectionproperties.post.fibre import to_fibre_section\n",
     "from sectionproperties.pre.library import i_section\n",
     "\n",
+    "\n",
     "geom = i_section(d=203, b=133, t_f=7.8, t_w=5.8, r=8.9, n_r=8)\n",
     "geom.create_mesh(mesh_sizes=10)\n",
     "\n",
@@ -61,6 +62,7 @@
    "source": [
     "from shutil import which\n",
     "\n",
+    "\n",
     "# write the fibre section to a file\n",
     "# uncomment below to write file\n",
     "# with open('200UB25.4.sp', 'w') as f:\n",
@@ -134,6 +136,7 @@
    "source": [
     "from sectionproperties.analysis import Section\n",
     "\n",
+    "\n",
     "sec = Section(geom)\n",
     "sec.calculate_geometric_properties()\n",
     "x, y = sec.get_c()\n",
@@ -185,6 +188,7 @@
    "source": [
     "from os.path import exists\n",
     "\n",
+    "\n",
     "# write the fibre section to a file with material tag replaced\n",
     "# uncomment below to write file\n",
     "# with open('200UB25.4.sp', 'w') as f:\n",
@@ -221,8 +225,8 @@
    "outputs": [],
    "source": [
     "if result_available:\n",
-    "    from matplotlib import pyplot as plt\n",
     "    import numpy as np\n",
+    "    from matplotlib import pyplot as plt\n",
     "\n",
     "    data = np.loadtxt(\"R1-RF42.txt\")\n",
     "    twist = data[:, 0] * 0.1\n",

docs/examples/analysis/frame_analysis.ipynb

@@ -48,8 +48,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from sectionproperties.pre.library import polygon_hollow_section\n",
     "from sectionproperties.analysis import Section\n",
+    "from sectionproperties.pre.library import polygon_hollow_section\n",
+    "\n",
     "\n",
     "geom = polygon_hollow_section(d=600, t=12, n_sides=12, r_in=20, n_r=8)\n",
     "geom.create_mesh(mesh_sizes=20)\n",
@@ -76,6 +77,7 @@
    "source": [
     "import time\n",
     "\n",
+    "\n",
     "start = time.time()\n",
     "sec.calculate_geometric_properties()\n",
     "sec.calculate_warping_properties()\n",

docs/examples/analysis/geometric_analysis.ipynb

@@ -43,6 +43,7 @@
    "source": [
     "from sectionproperties.pre.library import i_section\n",
     "\n",
+    "\n",
     "geom = i_section(d=203, b=133, t_f=7.8, t_w=5.8, r=8.9, n_r=8)"
    ]
   },
@@ -63,6 +64,7 @@
    "source": [
     "from sectionproperties.analysis import Section\n",
     "\n",
+    "\n",
     "geom.create_mesh(mesh_sizes=5)\n",
     "sec = Section(geometry=geom)"
    ]
@@ -175,6 +177,7 @@
    "source": [
     "from sectionproperties.pre.library import channel_section\n",
     "\n",
+    "\n",
     "# create 150 pfc geometry\n",
     "pfc = channel_section(d=150, b=75, t_f=9.5, t_w=6, r=10, n_r=8)\n",
     "pfc.plot_geometry(legend=False)"
@@ -265,6 +268,7 @@
     "from rich.console import Console\n",
     "from rich.table import Table\n",
     "\n",
+    "\n",
     "# setup table\n",
     "table = Table(title=\"Section Properties Comparison\")\n",
     "table.add_column(\"Property\", justify=\"left\", style=\"cyan\", no_wrap=True)\n",