Skip to content

Commit 27fb40c

Browse files
authored
Merge pull request #126 from precice/micro-manager-v0.5.0
Release v0.5.0
2 parents 6d26f16 + 98d2485 commit 27fb40c

File tree

79 files changed

+3281
-768
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3281
-768
lines changed

.github/pull_request_template.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!-- Add a short description of your contribution here. Skip this if the title is self-explanatory -->
2+
3+
Checklist:
4+
5+
- [ ] I made sure that the CI passed before I ask for a review.
6+
- [ ] I added a summary of the changes (compared to the last release) in the `CHANGELOG.md`.
7+
- [ ] If necessary, I made changes to the documentation and/or added new content.
8+
- [ ] I will remember to squash-and-merge, providing a useful summary of the changes of this PR.

.github/workflows/check-links.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/check-markdown.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/check-pep8.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/pythonpublish.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@ jobs:
1515
with:
1616
python-version: '3.x'
1717
- name: Install dependencies
18-
run: |
19-
python -m pip install --upgrade pip
20-
pip install setuptools wheel twine
18+
uses: BSFishy/pip-action@v1
19+
with:
20+
packages: |
21+
twine
22+
build
2123
- name: Build and publish
2224
env:
2325
TWINE_USERNAME: __token__
2426
TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}
2527
run: |
26-
python setup.py sdist
28+
pyproject-build
2729
twine upload dist/*

.github/workflows/run-adaptivity-test.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
pull_request:
88
branches:
99
- "*"
10-
jobs:
10+
jobs:
1111
adaptivity_integration_tests:
1212
name: Run adaptivity integration tests
1313
runs-on: ubuntu-latest
1414
container: precice/precice:nightly
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
path: micro-manager
2020

@@ -23,34 +23,33 @@ jobs:
2323
run: |
2424
apt-get -qq update
2525
apt-get -qq install python3-dev python3-pip git python-is-python3 pkg-config
26-
python -m pip install --upgrade pip
27-
pip install setuptools wheel
26+
pip3 install --upgrade pip
2827
2928
- name: Install Micro Manager
3029
working-directory: micro-manager
31-
run: pip3 install --user .
30+
run: pip3 install .
3231

3332
- name: Run integration test with local adaptivity
3433
timeout-minutes: 3
3534
working-directory: micro-manager/tests/integration/test_unit_cube
3635
run: |
37-
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
38-
python3 unit_cube.py & python3 run_micro_manager.py --config micro-manager-config-local-adaptivity.json
36+
micro-manager-precice micro-manager-config-local-adaptivity.json &
37+
python3 unit_cube.py
3938
4039
- name: Run integration test with global adaptivity
4140
timeout-minutes: 3
4241
working-directory: micro-manager/tests/integration/test_unit_cube
4342
run: |
44-
export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
45-
python3 unit_cube.py & python3 run_micro_manager.py --config micro-manager-config-global-adaptivity.json
43+
micro-manager-precice micro-manager-config-global-adaptivity.json &
44+
python3 unit_cube.py
4645
4746
adaptivity_unit_tests_serial:
4847
name: Run adaptivity unit tests in serial
4948
runs-on: ubuntu-latest
5049
container: precice/precice:nightly
5150
steps:
5251
- name: Checkout Repository
53-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5453
with:
5554
path: micro-manager
5655

@@ -59,8 +58,7 @@ jobs:
5958
run: |
6059
apt-get -qq update
6160
apt-get -qq install python3-dev python3-pip git python-is-python3 pkg-config
62-
python -m pip install --upgrade pip
63-
pip install setuptools wheel
61+
pip3 install --upgrade pip
6462
6563
- name: Install Micro Manager
6664
working-directory: micro-manager
@@ -76,7 +74,7 @@ jobs:
7674
container: precice/precice:nightly
7775
steps:
7876
- name: Checkout Repository
79-
uses: actions/checkout@v3
77+
uses: actions/checkout@v4
8078
with:
8179
path: micro-manager
8280

@@ -94,8 +92,7 @@ jobs:
9492
run: |
9593
apt-get -qq update
9694
apt-get -qq install python3-dev python3-pip git python-is-python3 pkg-config
97-
python -m pip install --upgrade pip
98-
pip install setuptools wheel twine
95+
pip3 install --upgrade pip
9996
10097
- name: Install Micro Manager
10198
working-directory: micro-manager

.github/workflows/run-checks.yml

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Run checks for markdown, links, and pre-commit
2+
on:
3+
push:
4+
branches:
5+
- main
6+
- develop
7+
pull_request:
8+
branches:
9+
- "*"
10+
jobs:
11+
check_md:
12+
name: Lint markdown files
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Check out repository
16+
uses: actions/checkout@v4
17+
- name: Lint markdown files (markdownlint)
18+
uses: articulate/actions-markdownlint@v1
19+
with:
20+
config: .markdownlint.json
21+
files: '.'
22+
23+
check_links:
24+
name: Check links in markdown files
25+
runs-on: ubuntu-latest
26+
steps:
27+
- name: Check out repository
28+
uses: actions/checkout@v4
29+
- name: Check links in markdown files (markdown-link-check)
30+
uses: gaurav-nelson/github-action-markdown-link-check@v1
31+
with:
32+
use-quiet-mode: 'yes'
33+
use-verbose-mode: 'no'
34+
config-file: '.markdown-link-check-config.json'
35+
36+
precommit:
37+
name: pre-commit checks
38+
runs-on: ubuntu-latest
39+
steps:
40+
- uses: actions/checkout@v4
41+
- name: Setup python
42+
uses: actions/setup-python@v5
43+
with:
44+
python-version: '3.10'
45+
check-latest: true
46+
- name: Install pre-commit
47+
run: pip install pre-commit
48+
- name: Run checks
49+
run: pre-commit run -a -v
50+
- name: Git status
51+
if: always()
52+
run: git status
53+
- name: Full diff
54+
if: always()
55+
run: git diff

.github/workflows/run-domain-decomposition-tests.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ on:
77
pull_request:
88
branches:
99
- "*"
10-
jobs:
10+
jobs:
1111
domain_decomposition_integration_tests:
1212
name: Run domain decomposition integration tests
1313
runs-on: ubuntu-latest
1414
container: precice/precice:nightly
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
path: micro-manager
2020

@@ -30,31 +30,35 @@ jobs:
3030
- name: Install Dependencies
3131
working-directory: micro-manager
3232
run: |
33+
apt-get -qq update
3334
apt-get -qq install python3-dev python3-pip git python-is-python3 pkg-config
34-
python -m pip install --upgrade pip
35-
pip install setuptools wheel twine
35+
pip3 install --upgrade pip
3636
3737
- name: Install micro-manager
3838
working-directory: micro-manager
39-
run: pip3 install --user .
39+
run: pip3 install .
4040

41-
- name: Run integration test (variant 1)
41+
- name: Run integration test (2 processes)
4242
timeout-minutes: 3
4343
working-directory: micro-manager/tests/integration/test_unit_cube
44-
run: mpiexec -n 2 --allow-run-as-root python3 run_micro_manager.py --config micro-manager-config-parallel-1.json & python3 unit_cube.py
45-
46-
- name: Run integration test (variant 2)
44+
run: |
45+
mpiexec -n 2 --allow-run-as-root micro-manager-precice micro-manager-config-parallel-1.json &
46+
python3 unit_cube.py
47+
48+
- name: Run integration test (6 processes)
4749
timeout-minutes: 3
4850
working-directory: micro-manager/tests/integration/test_unit_cube
49-
run: mpiexec -n 6 --oversubscribe --allow-run-as-root python3 run_micro_manager.py --config micro-manager-config-parallel-2.json & python3 unit_cube.py
51+
run: |
52+
mpiexec -n 6 --oversubscribe --allow-run-as-root micro-manager-precice micro-manager-config-parallel-2.json &
53+
python3 unit_cube.py
5054
5155
domain_decomposition_unit_tests:
5256
name: Run domain decomposition unit tests
5357
runs-on: ubuntu-latest
5458
container: precice/precice:nightly
5559
steps:
5660
- name: Checkout Repository
57-
uses: actions/checkout@v3
61+
uses: actions/checkout@v4
5862
with:
5963
path: micro-manager
6064

@@ -63,8 +67,7 @@ jobs:
6367
run: |
6468
apt-get -qq update
6569
apt-get -qq install python3-dev python3-pip git python-is-python3 pkg-config
66-
python -m pip install --upgrade pip
67-
pip install setuptools wheel
70+
pip3 install --upgrade pip
6871
6972
- name: Install Micro Manager
7073
working-directory: micro-manager

.github/workflows/run-macro-micro-dummy.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ on:
77
pull_request:
88
branches:
99
- "*"
10-
jobs:
10+
jobs:
1111
run_dummy:
1212
name: Run dummy
1313
runs-on: ubuntu-latest
1414
container: precice/precice:nightly
1515
steps:
1616

1717
- name: Checkout Repository
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
path: micro-manager
2121

@@ -25,22 +25,26 @@ jobs:
2525
apt-get -qq update
2626
apt-get -qq install python3-dev python3-pip git python-is-python3 pkg-config
2727
apt-get -qq install sudo
28-
python -m pip install --upgrade pip
29-
pip install setuptools wheel twine
28+
pip3 install --upgrade pip
3029
3130
- name: Install micro-manager
3231
working-directory: micro-manager
33-
run: pip3 install --user .
32+
run: |
33+
pip3 install .
3434
3535
- name: Run python macro-micro dummy
3636
timeout-minutes: 3
3737
working-directory: micro-manager/examples
38-
run: python3 python-dummy/run_micro_manager.py --config micro-manager-config.json & python3 macro_dummy.py
38+
run: |
39+
micro-manager-precice micro-manager-python-config.json &
40+
python3 macro_dummy.py
3941
4042
- name: Run adaptive python macro-micro dummy
4143
timeout-minutes: 3
4244
working-directory: micro-manager/examples
43-
run: python3 python-dummy/run_micro_manager.py --config micro-manager-adaptivity-config.json & python3 macro_dummy.py
45+
run: |
46+
micro-manager-precice micro-manager-python-adaptivity-config.json &
47+
python3 macro_dummy.py
4448
4549
- name: Run c++ macro-micro dummy
4650
timeout-minutes: 3
@@ -50,9 +54,12 @@ jobs:
5054
pip install pybind11
5155
c++ -O3 -Wall -shared -std=c++11 -fPIC $(python3 -m pybind11 --includes) micro_cpp_dummy.cpp -o micro_dummy$(python3-config --extension-suffix)
5256
cd ../
53-
python3 cpp-dummy/run_micro_manager.py --config micro-manager-config.json & python3 macro_dummy.py
57+
micro-manager-precice micro-manager-cpp-config.json &
58+
python3 macro_dummy.py
5459
5560
- name: Run adaptive c++ macro-micro dummy
5661
timeout-minutes: 3
5762
working-directory: micro-manager/examples
58-
run: python3 cpp-dummy/run_micro_manager.py --config micro-manager-adaptivity-config.json & python3 macro_dummy.py
63+
run: |
64+
micro-manager-precice micro-manager-cpp-adaptivity-config.json &
65+
python3 macro_dummy.py

0 commit comments

Comments
 (0)