Skip to content

Commit

Permalink
chore: upgrade pipeline (#76)
Browse files Browse the repository at this point in the history
* Upgrade black

* Add 3.12 to pipeline
  • Loading branch information
mortenengen authored Jan 30, 2024
1 parent de690c3 commit f46aaac
Show file tree
Hide file tree
Showing 30 changed files with 31 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10", "3.11"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""A Python package that contains models from structural design codes."""

from . import codes, core, materials
from .codes import get_design_codes, set_design_code, set_national_annex

Expand Down
1 change: 1 addition & 0 deletions structuralcodes/codes/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Collection of functions related to design codes."""

import types
import typing as t

Expand Down
1 change: 1 addition & 0 deletions structuralcodes/codes/ec2_2004/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""EUROCODE 2 1992-1-1:2004."""

import typing as t

from ._section_7_3_crack_control import (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""Collection of functions from EUROCODE 1992-1-1:2004
Chapter 7.3 - Crack control.
"""

import math
import typing as t

Expand Down
1 change: 1 addition & 0 deletions structuralcodes/codes/ec2_2004/shear.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Design rules according to EN 1992-1-1 regarding shear."""

import math

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/codes/ec2_2023/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""EUROCODE 2 1992-1-1:2023."""

import typing as t

from ._section5_materials import (
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/codes/mc2010/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""The fib Model Code 2010."""

import typing as t
from ._concrete_material_properties import fcm, fctm, fctkmin, fctkmax, Gf

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Shear at the interface between concrete with different casting times."""

from math import pi, sin, cos


Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""A collection of material properties for concrete."""

import math


Expand Down
4 changes: 2 additions & 2 deletions structuralcodes/codes/mc2010/_concrete_punching.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Covers punching in Model code 2010, 7.3.5.1 to 7.3.5.4."""

import warnings
from math import pi, sin, cos

Expand Down Expand Up @@ -394,8 +395,7 @@ def v_rd_max_punching(
0.6,
)
return min(
(k_sys * k_psi * b_0(v_ed, v_prep_d_max) * d_v * f_ck**0.5)
/ gamma_c,
(k_sys * k_psi * b_0(v_ed, v_prep_d_max) * d_v * f_ck**0.5) / gamma_c,
(b_0(v_ed, v_prep_d_max) * d_v * f_ck**0.5) / gamma_c,
)

Expand Down
1 change: 1 addition & 0 deletions structuralcodes/codes/mc2010/_concrete_shear.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""A collection of shear formulas for concrete."""

import warnings
from typing import Optional
from math import pi, tan, sin
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/core/base.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Abstract base classes."""

import abc
import typing as t
import warnings
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/materials/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Main entry point for materials."""

from . import concrete


Expand Down
1 change: 1 addition & 0 deletions structuralcodes/materials/concrete/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Concrete material."""

import typing as t
from structuralcodes.codes import _use_design_code
from ._concrete import Concrete
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/materials/concrete/_concrete.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Core implementation of the concrete material."""

import abc
import typing as t
from structuralcodes.core.base import Material
Expand Down
1 change: 1 addition & 0 deletions structuralcodes/materials/concrete/_concreteMC2010.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""The concrete class for Model Code 2020 Concrete Material."""

import typing as t
import warnings

Expand Down
1 change: 1 addition & 0 deletions tests/test_concrete_diff_casting_time.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test for the function of _interface_different_casting_time"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_concrete_mc2010.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for the concrete mc2010"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_concrete_punching.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test for the function of _concrete_punching"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_concrete_shear.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test for the function of _concrete_shear"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_concrete_torsion.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test for the function of _concrete_torsion"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_ec2_2004_annex_B_shrink_and_creep.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
""" Tests for EUROCODE 2-1-2:2004 Annex B and chapter 3"""

import pytest
from structuralcodes.codes.ec2_2004 import annex_b_shrink_and_creep

Expand Down
1 change: 1 addition & 0 deletions tests/test_ec2_2004_section_7_3_crack_control.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for EUROCODE 2-1-1:2004 Chapter 7.3 Crack Control"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_ec2_2004_shear.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Test for the ec2.shear module"""

import math
import pytest

Expand Down
1 change: 1 addition & 0 deletions tests/test_ec2_2023_annexB_time_dependent.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for _AnnexB_TimeDependent module"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_ec2_2023_section5_materials.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for _section5_materials module"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_ec2_2023_section9_sls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for the _section9_sls module"""

import math

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_get_set_design_code.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for getting and setting design codes"""

import types

import pytest
Expand Down
1 change: 1 addition & 0 deletions tests/test_mc2010_material_properties.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Tests for the _concrete_material_properties module"""

import math

import pytest
Expand Down

0 comments on commit f46aaac

Please sign in to comment.