Skip to content

Commit

Permalink
Merge pull request #124 from robbievanleeuwen/update-dependencies
Browse files Browse the repository at this point in the history
Update core and dev dependencies
  • Loading branch information
robbievanleeuwen authored May 27, 2024
2 parents d5bbe05 + 6f5aac9 commit c0c51a2
Show file tree
Hide file tree
Showing 26 changed files with 1,866 additions and 1,643 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ 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.11", os: "macos-latest", session: "tests" }
- { python: "3.10", os: "macos-latest", session: "tests" }
- { python: "3.9", os: "macos-latest", session: "tests" }
- { python: "3.11", os: "macos-13", session: "tests" }
- { python: "3.10", os: "macos-13", session: "tests" }
- { python: "3.9", os: "macos-13", session: "tests" }
- { python: "3.10", os: "ubuntu-latest", session: "docs-build" }

env:
Expand Down
12 changes: 6 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,21 @@ repos:
types: [text]
stages: [commit, push, manual]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.0.3
rev: v3.1.0
hooks:
- id: prettier
- repo: https://github.com/kynan/nbstripout
rev: 0.6.1
rev: 0.7.1
hooks:
- id: nbstripout
- repo: https://github.com/nbQA-dev/nbQA
rev: 1.7.0
rev: 1.8.4
hooks:
- id: nbqa-black
additional_dependencies: [black==23.9.1]
additional_dependencies: [black==24.2.0]
- id: nbqa-pyupgrade
additional_dependencies: [pyupgrade==3.14.0]
additional_dependencies: [pyupgrade==3.15.1]
args: ["--py39-plus"]
- id: nbqa-isort
additional_dependencies: [isort==5.12.0]
additional_dependencies: [isort==5.13.2]
args: [--profile=black]
34 changes: 17 additions & 17 deletions docs/_static/animation.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "75fa61c6",
"id": "0",
"metadata": {},
"source": [
"# Animation\n",
Expand All @@ -13,7 +13,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "80dd0715",
"id": "1",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -30,7 +30,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "24c549c2",
"id": "2",
"metadata": {},
"source": [
"## Define Materials"
Expand All @@ -39,7 +39,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "43119509",
"id": "3",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -79,7 +79,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "c2a50e90",
"id": "4",
"metadata": {},
"source": [
"## Construct Geometry"
Expand All @@ -88,7 +88,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "bcc69df7",
"id": "5",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -159,7 +159,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "34bf7ab4",
"id": "6",
"metadata": {},
"source": [
"## Perform Moment-Curvature Analysis"
Expand All @@ -168,7 +168,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "380bd20e",
"id": "7",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -178,7 +178,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "5fb9dee6",
"id": "8",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -188,7 +188,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "eb3f2bbb",
"id": "9",
"metadata": {},
"source": [
"## Generate Stress Results"
Expand All @@ -197,7 +197,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "18cac839",
"id": "10",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -223,7 +223,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "cc0bce6c",
"id": "11",
"metadata": {},
"source": [
"## Create Plotting Function"
Expand All @@ -232,7 +232,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "cda384c3",
"id": "12",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -364,7 +364,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "d0a16408",
"id": "13",
"metadata": {},
"source": [
"## Generate Images"
Expand All @@ -373,7 +373,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "66ba6dd6",
"id": "14",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -392,7 +392,7 @@
{
"attachments": {},
"cell_type": "markdown",
"id": "b7b500e9",
"id": "15",
"metadata": {},
"source": [
"## Generate GIF"
Expand All @@ -401,7 +401,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "97477bc1",
"id": "16",
"metadata": {},
"outputs": [],
"source": [
Expand Down
1 change: 0 additions & 1 deletion docs/_static/doc_plots/mander_confined_plot.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""Plotting function to generate the mander confined plot."""


import matplotlib.pyplot as plt
import numpy as np

Expand Down
22 changes: 11 additions & 11 deletions docs/examples/area_properties.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"cells": [
{
"cell_type": "markdown",
"id": "4420ea1d",
"id": "0",
"metadata": {},
"source": [
"# Calculating Area Properties"
]
},
{
"cell_type": "markdown",
"id": "588b04b5",
"id": "1",
"metadata": {},
"source": [
"This example demonstrates how to create a simple reinforced concrete cross-section and obtain the gross area properties. We start by importing the necessary modules."
Expand All @@ -19,7 +19,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "8ef72f3c",
"id": "2",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -37,7 +37,7 @@
},
{
"cell_type": "markdown",
"id": "f043c56c",
"id": "3",
"metadata": {},
"source": [
"## Assign Materials\n",
Expand All @@ -48,7 +48,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "601632bd",
"id": "4",
"metadata": {},
"outputs": [],
"source": [
Expand Down Expand Up @@ -80,7 +80,7 @@
},
{
"cell_type": "markdown",
"id": "47b6a2a8",
"id": "5",
"metadata": {},
"source": [
"## Create Geometry and Concrete Section\n",
Expand All @@ -91,7 +91,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "5f88f832",
"id": "6",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -116,7 +116,7 @@
},
{
"cell_type": "markdown",
"id": "c4d5fa61",
"id": "7",
"metadata": {},
"source": [
"## Gross Properties\n",
Expand All @@ -127,7 +127,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "185cb492",
"id": "8",
"metadata": {},
"outputs": [],
"source": [
Expand All @@ -137,7 +137,7 @@
},
{
"cell_type": "markdown",
"id": "894b8070",
"id": "9",
"metadata": {},
"source": [
"## Transformed Properties\n",
Expand All @@ -148,7 +148,7 @@
{
"cell_type": "code",
"execution_count": null,
"id": "e41dbfca",
"id": "10",
"metadata": {},
"outputs": [],
"source": [
Expand Down
Loading

0 comments on commit c0c51a2

Please sign in to comment.