Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .coverage
Binary file not shown.
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
poetry run mypy
- name: Run FEM tests with pytest
run: |
poetry run pytest --pspec tests/
poetry run pytest
publish:
name: Publish to PyPI
needs:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
poetry run mypy -p anastruct
- name: Run FEM tests with pytest
run: |
poetry run pytest --pspec tests/
poetry run pytest

run_tests:
name: Run FEM Testing Suite on Multiple Python Versions
Expand All @@ -57,4 +57,4 @@ jobs:

- name: Run FEM tests with pytest
run: |
poetry run pytest --pspec tests/
poetry run pytest
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
"pylint.severity": {
"refactor": "Information"
},
"python.analysis.typeCheckingMode": "basic"
"python.analysis.typeCheckingMode": "basic",
"python.testing.pytestEnabled": true,
"testing.coverageToolbarEnabled": true
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
144 changes: 128 additions & 16 deletions poetry.lock

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ pylint = "==4.0.2"
mypy = "==1.18.2"
black = { version = "==25.11.0", extras = ["jupyter"] }
pytest = "==8.4.2"
pytest-cov = "==7.0.0"
pytest-describe = "==3.0.0"
pytest-pspec = "==0.0.4"
pytest-raises = "==0.11"

[tool.poetry.group.docs]
Expand Down Expand Up @@ -92,6 +92,11 @@ disable = [
max-line-length = 120
py-version = [3.10, 3.11, 3.12, 3.13]

[tool.pytest.ini_options]
testpaths = ["tests"]
addopts = "--cov=anastruct"
required_plugins = ["pytest-raises", "pytest-describe", "pytest-cov"]

[tool.mypy]
packages = "anastruct"
python_version = "3.10"
Expand Down
29 changes: 15 additions & 14 deletions tests/fixtures/e2e_fixtures.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import pytest
import numpy as np
import pytest

from anastruct import LoadCase, LoadCombination, SystemElements
from anastruct.fem.examples.ex_8_non_linear_portal import ss as SS_ex8
from anastruct.fem.examples.ex_7_rotational_spring import ss as SS_ex7
from anastruct.fem.examples.ex_11 import ss as SS_ex11
from anastruct.fem.examples.ex_12 import ss as SS_ex12
from anastruct.fem.examples.ex_13 import ss as SS_ex13
from anastruct.fem.examples.ex_14 import ss as SS_ex14
from anastruct.fem.examples.ex_15 import ss as SS_ex15
from anastruct.fem.examples.ex_16 import ss as SS_ex16
from anastruct.fem.examples.ex_17_gnl import ss as SS_ex17
from anastruct.fem.examples.ex_18_discretize import ss as SS_ex18
from anastruct.fem.examples.ex_19_num_displacements import ss as SS_ex19
from anastruct.fem.examples.ex_20_insert_node import ss as SS_ex20
from anastruct.fem.examples.ex_26_deflection import ss as SS_ex26
from examples.ex_7_rotational_spring import ss as SS_ex7
from examples.ex_8_non_linear_portal import ss as SS_ex8
from examples.ex_11 import ss as SS_ex11
from examples.ex_12 import ss as SS_ex12
from examples.ex_13 import ss as SS_ex13
from examples.ex_14 import ss as SS_ex14
from examples.ex_15 import ss as SS_ex15
from examples.ex_16 import ss as SS_ex16
from examples.ex_17_gnl import ss as SS_ex17
from examples.ex_18_discretize import ss as SS_ex18
from examples.ex_19_num_displacements import ss as SS_ex19
from examples.ex_20_insert_node import ss as SS_ex20
from examples.ex_26_deflection import ss as SS_ex26


@pytest.fixture
Expand Down
6 changes: 0 additions & 6 deletions tests/pytest.ini

This file was deleted.

Loading
Loading