Skip to content

Commit e357c0d

Browse files
Merge pull request #317 from bessagroup/pr/2.2.2
version bump
2 parents 717ac84 + 533226c commit e357c0d

File tree

5 files changed

+27
-8
lines changed

5 files changed

+27
-8
lines changed

.github/workflows/crw.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Code Release Week
2+
3+
on:
4+
pull_request:
5+
6+
jobs:
7+
run-crw:
8+
if: contains(github.event.pull_request.labels.*.name, 'code release week')
9+
uses: bessagroup/.github/.github/workflows/code-release-week.yml@main
10+
with:
11+
python-version: "3.12"

.github/workflows/pull_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Install dependencies
2424
run: |
2525
python -m pip install --upgrade pip
26-
python -m pip install '.[test,all]'
26+
python -m pip install '.[tests,all]'
2727
2828
- name: Test with pytest
2929
run: |

Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
PACKAGEDIR := dist
44
COVERAGEREPORTDIR := coverage_html_report
55

6-
.PHONY: help init init-dev test test-smoke test-smoke-html test-html build upload upload-testpypi
6+
.PHONY: help init init-dev test test-smoke test-smoke-html test-html build upload upload-testpypi docs lint
77

88
help:
99
@echo "Please use \`make <target>' where <target> is one of:"
@@ -16,6 +16,8 @@ help:
1616
@echo " build Build the package"
1717
@echo " upload Upload the package to the PyPi index"
1818
@echo " upload-testpypi Upload the package to the PyPi-test index"
19+
@echo " docs Build the documentation with mkdocs"
20+
@echo " lint Lint the code with ruff"
1921

2022
init:
2123
pip install -r requirements.txt
@@ -35,8 +37,7 @@ test-html:
3537
xdg-open ./$(COVERAGEREPORTDIR)/index.html
3638

3739
build:
38-
-rm -rf $(PACKAGEDIR)/*
39-
python -m build
40+
uv build
4041

4142
upload-testpypi:
4243
$(MAKE) build
@@ -45,3 +46,9 @@ upload-testpypi:
4546
upload:
4647
$(MAKE) build
4748
twine upload $(PACKAGEDIR)/* --verbose
49+
50+
docs:
51+
mkdocs build
52+
53+
lint:
54+
ruff check

pyproject.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@ maintainers = [
3636
name = "f3dasm"
3737
readme = "README.md"
3838
requires-python = ">=3.10"
39-
version = "2.2.1"
39+
version = "2.2.2"
4040

4141
[project.optional-dependencies]
4242
all = [
4343
"abaqus2py>=1.0.0",
4444
"optuna>=4.4.0"
4545
]
4646
dev = [
47-
"pre-commit>=4.4.0"
47+
"pre-commit>=4.4.0",
48+
"ruff>=0.14.10"
4849
]
4950
docs = [
5051
"mkdocs-gen-files>=0.5.0",
@@ -55,7 +56,7 @@ docs = [
5556
"mkdocstrings-python>=1.18.2",
5657
"pymdown-extensions>=10.16.1"
5758
]
58-
test = [
59+
tests = [
5960
"hypothesis>=6.138.0",
6061
"pytest>=8.4.1",
6162
"pytest-cov>=6.2.1"

src/f3dasm/_src/mpi_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from mpi4py import MPI
1515

1616
MPI_AVAILABLE = True
17-
except ImportError:
17+
except (ImportError, RuntimeError):
1818
MPI_AVAILABLE = False
1919

2020
if TYPE_CHECKING:

0 commit comments

Comments
 (0)