Apply linting and formatting

Author: robbievanleeuwen

.github/workflows/ci.yml

@@ -179,4 +179,4 @@ jobs:
       - name: Upload coverage report
         uses: codecov/codecov-action@v4
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/release.yml

@@ -66,4 +66,4 @@ jobs:
           publish: ${{ steps.check-version.outputs.tag != '' }}
           tag: ${{ steps.check-version.outputs.tag }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/_static/anim/gen.py

@@ -1,8 +1,9 @@
+"""Script that combines multiple pngs into a gif."""
+
 import glob
 
 from PIL import Image
 
-
 # filepaths
 fp_in = "*.png"
 fp_out = "anim.gif"

docs/_static/animation.ipynb

@@ -249,6 +249,7 @@
     "\n",
     "\n",
     "def plot_stress_and_graph(res_idx, mk_res_list, k_list, m_list, **kwargs):\n",
+    "    \"\"\"Function that plots the animation.\"\"\"\n",
     "    with plotting_context(title=\"Stress\", **kwargs) as (fig, ax):\n",
     "        # plot background\n",
     "        mk_res_list[res_idx].concrete_section.plot_section(\n",
@@ -267,14 +268,14 @@
     "        conc_sig_max = (\n",
     "            max([max(x) for x in mk_res_list[res_idx].concrete_stresses]) + 1e-12\n",
     "        )\n",
-    "        steel_sig_min = min(mk_res_list[res_idx].lumped_reinforcement_stresses)\n",
-    "        steel_sig_max = max(mk_res_list[res_idx].lumped_reinforcement_stresses)\n",
+    "        # steel_sig_min = min(mk_res_list[res_idx].lumped_reinforcement_stresses)\n",
+    "        # steel_sig_max = max(mk_res_list[res_idx].lumped_reinforcement_stresses)\n",
     "\n",
     "        # set up ticks\n",
     "        v_conc = np.linspace(conc_sig_min, conc_sig_max, 15, endpoint=True)\n",
-    "        v_steel = np.linspace(steel_sig_min, steel_sig_max, 15, endpoint=True)\n",
-    "        ticks_conc = v_conc\n",
-    "        ticks_steel = v_steel\n",
+    "        # v_steel = np.linspace(steel_sig_min, steel_sig_max, 15, endpoint=True)\n",
+    "        # ticks_conc = v_conc\n",
+    "        # ticks_steel = v_steel\n",
     "\n",
     "        # plot the concrete stresses\n",
     "        for idx, sig in enumerate(mk_res_list[res_idx].concrete_stresses):\n",
@@ -294,9 +295,7 @@
     "                )\n",
     "\n",
     "                # plot the filled contour\n",
-    "                trictr = ax.tricontourf(\n",
-    "                    triang, sig, v_conc, cmap=cmap_conc, norm=CenteredNorm()\n",
-    "                )\n",
+    "                ax.tricontourf(triang, sig, v_conc, cmap=cmap_conc, norm=CenteredNorm())\n",
     "\n",
     "                # plot a zero stress contour, supressing warning\n",
     "                with warnings.catch_warnings():\n",
@@ -308,21 +307,19 @@
     "                    # set zero stress for neutral axis contour\n",
     "                    zero_level = 0\n",
     "\n",
-    "                    if min(sig) > 0:\n",
-    "                        if min(sig) < 1e-3:\n",
-    "                            zero_level = min(sig) + 1e-12\n",
+    "                    if min(sig) > 0 and min(sig) < 1e-3:\n",
+    "                        zero_level = min(sig) + 1e-12\n",
     "\n",
-    "                    if max(sig) < 0:\n",
-    "                        if max(sig) > -1e-3:\n",
-    "                            zero_level = max(sig) - 1e-12\n",
+    "                    if max(sig) < 0 and max(sig) > -1e-3:\n",
+    "                        zero_level = max(sig) - 1e-12\n",
     "\n",
     "                    if min(sig) == 0:\n",
     "                        zero_level = 1e-12\n",
     "\n",
     "                    if max(sig) == 0:\n",
     "                        zero_level = -1e-12\n",
     "\n",
-    "                    CS = ax.tricontour(\n",
+    "                    ax.tricontour(\n",
     "                        triang, sig, [zero_level], linewidths=1, linestyles=\"dashed\"\n",
     "                    )\n",
     "\n",
@@ -409,7 +406,6 @@
     "\n",
     "from PIL import Image\n",
     "\n",
-    "\n",
     "# filepaths\n",
     "fp_in = \"anim/*.png\"\n",
     "fp_out = \"anim.gif\"\n",
@@ -444,7 +440,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.12"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,

docs/_static/doc_plots/add_bar_context.py

@@ -7,7 +7,6 @@
 import numpy as np
 import sectionproperties.pre.library.primitive_sections as sp_ps
 
-
 if TYPE_CHECKING:
     from sectionproperties.pre.geometry import CompoundGeometry, Geometry
 

docs/_static/logo.py

@@ -1,9 +1,10 @@
+"""Script to generate the concreteproperties logo."""
+
 from sectionproperties.analysis.section import Section
 from sectionproperties.pre.geometry import Geometry
 from sectionproperties.pre.library.primitive_sections import circular_section
 from sectionproperties.pre.pre import Material
 
-
 concrete = Material(
     name="Concrete",
     elastic_modulus=30.1e3,

docs/examples/biaxial_bending.ipynb

@@ -211,12 +211,10 @@
    "outputs": [],
    "source": [
     "n_list = np.linspace(0, 7400e3, 5)\n",
-    "biaxial_results = []\n",
-    "\n",
-    "for n in n_list:\n",
-    "    biaxial_results.append(\n",
-    "        conc_sec.biaxial_bending_diagram(n=n, n_points=24, progress_bar=False)\n",
-    "    )"
+    "biaxial_results = [\n",
+    "    conc_sec.biaxial_bending_diagram(n=n, n_points=24, progress_bar=False)\n",
+    "    for n in n_list\n",
+    "]"
    ]
   },
   {
@@ -270,19 +268,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "labels = []\n",
+    "import matplotlib.pyplot as plt\n",
     "\n",
-    "for bb_res in biaxial_results[::2]:\n",
-    "    labels.append(f\"N = {bb_res.n / 1e3:.0f} kN\")\n",
+    "labels = [f\"N = {bb_res.n / 1e3:.0f} kN\" for bb_rs in biaxial_results[::2]]\n",
     "\n",
     "ax = BiaxialBendingResults.plot_multiple_diagrams_2d(\n",
     "    biaxial_results[::2], fmt=\"-\", labels=labels, render=False\n",
     ")\n",
     "ax.set_xlabel(\"Bending Moment $M_x$ [kN.m]\")\n",
     "ax.set_ylabel(\"Bending Moment $M_y$ [kN.m]\")\n",
-    "import matplotlib.pyplot as plt\n",
-    "\n",
-    "\n",
     "plt.show()"
    ]
   }
@@ -303,7 +297,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.7"
   }
  },
  "nbformat": 4,

docs/examples/composite_section.ipynb

@@ -598,12 +598,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(\n",
-    "    f\"cx_geom = {conc_sec.moment_centroid[0]:.2f}; cy_geom = {conc_sec.moment_centroid[1]:.2f}\"\n",
-    ")\n",
-    "print(\n",
-    "    f\"cx_gross = {conc_sec.gross_properties.cx_gross:.2f}; cy_gross = {conc_sec.gross_properties.cy_gross:.2f}\"\n",
-    ")"
+    "cx_geom = conc_sec.moment_centroid[0]\n",
+    "cy_geom = conc_sec.moment_centroid[1]\n",
+    "cx_gross = conc_sec.gross_properties.cx_gross\n",
+    "cy_gross = conc_sec.gross_properties.cy_gross\n",
+    "print(f\"cx_geom = {cx_geom:.2f}; cy_geom = {cy_geom:.2f}\")\n",
+    "print(f\"cx_gross = {cx_gross:.2f}; cy_gross = {cy_gross:.2f}\")"
    ]
   },
   {
@@ -716,7 +716,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.7"
   },
   "vscode": {
    "interpreter": {

docs/examples/moment_curvature.ipynb

@@ -326,9 +326,8 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "print(\n",
-    "    f\"M_cr = {conc_sec.calculate_cracked_properties(theta=np.pi / 2).m_cr / 1e6:.2f} kN.m\"\n",
-    ")"
+    "m_cr = conc_sec.calculate_cracked_properties(theta=np.pi / 2).m_cr / 1e6\n",
+    "print(f\"M_cr = {m_cr:.2f} kN.m\")"
    ]
   },
   {
@@ -348,7 +347,6 @@
    "source": [
     "import matplotlib.pyplot as plt\n",
     "\n",
-    "\n",
     "fix, ax = plt.subplots()\n",
     "kappa = np.array(moment_curvature_results[-1].kappa)\n",
     "moment = np.array(moment_curvature_results[-1].m_xy) / 1e6\n",
@@ -700,7 +698,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.7"
   },
   "vscode": {
    "interpreter": {

docs/examples/moment_interaction.ipynb

@@ -378,12 +378,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "ax = mi_res.plot_diagram(fmt=\"-kx\", labels=True, label_offset=True, render=False)\n",
-    "\n",
-    "# reset axis limits to ensure labels are within plot\n",
     "import matplotlib.pyplot as plt\n",
     "\n",
+    "ax = mi_res.plot_diagram(fmt=\"-kx\", labels=True, label_offset=True, render=False)\n",
     "\n",
+    "# reset axis limits to ensure labels are within plot\n",
     "ax.set_xlim(-20, 850)\n",
     "ax.set_ylim(-3000, 9000)\n",
     "plt.show()"
@@ -406,7 +405,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.4"
+   "version": "3.12.7"
   },
   "vscode": {
    "interpreter": {