Skip to content

Commit f1b9886

Browse files
committed
Merge branch 'dev' into kzscisoft/filter-object
2 parents 5f054fe + 8c40782 commit f1b9886

File tree

75 files changed

+2051
-2764
lines changed

Some content is hidden

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

75 files changed

+2051
-2764
lines changed

.github/PULL_REQUEST_TEMPLATE/bug_fix.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# <Title of Bug Fix>
22

33
**Issue:** Link to the issue relating to this bug.
4+
45
**Python Version(s) Tested:** Python versions this fix has been verified against.
6+
57
**Operating System(s):** Operating systems this fix has been tested in.
68

79
## 📝 Summary

.github/PULL_REQUEST_TEMPLATE/feature.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# <Feature Title>
22

33
**Issue:** Link to the issue proposing this feature.
4+
45
**Python Version(s) Tested:** Python versions this feature has been tested on.
6+
57
**Operating System(s):** Operating systems this feature has been tested on.
8+
69
**Documentation PR:** Issue on [Docs repo](https://github.com/simvue-io/docs).
710

811
## 📝 Summary

.github/workflows/test_client_macos.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Simvue Nightlies (macOS)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '30 23 * * *'
7+
8+
permissions:
9+
contents: read
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build:
17+
timeout-minutes: 40
18+
runs-on: macos-latest
19+
steps:
20+
- uses: actions/checkout@v4
21+
- name: Set up Python 3.13
22+
uses: actions/setup-python@v5
23+
with:
24+
python-version: "3.13"
25+
- name: Install dependencies
26+
run: |
27+
rm poetry.lock
28+
python -m pip install poetry
29+
poetry self add poetry-plugin-export
30+
poetry export -f requirements.txt --with dev requirements.txt --all-extras
31+
python -m pip install torch
32+
python -m pip install -r requirements.txt
33+
python -m pip install .
34+
- name: Test with pytest
35+
env:
36+
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
37+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
38+
run: python -m pytest tests/ -m 'not scenario'

.github/workflows/test_client_ubuntu.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,22 +21,26 @@ jobs:
2121
build:
2222

2323
runs-on: ubuntu-latest
24-
timeout-minutes: 30
24+
timeout-minutes: 40
2525
steps:
2626
- uses: actions/checkout@v4
2727
- name: Set up Python 3.13
2828
uses: actions/setup-python@v5
2929
with:
3030
python-version: "3.13"
3131
- name: Install dependencies
32-
run: python -m pip install poetry
33-
- name: Test with pytest
3432
run: |
35-
export SIMVUE_URL=${{ secrets.SIMVUE_URL }}
36-
export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
37-
poetry install --all-extras
38-
# poetry run python -m pip install torch --index-url https://download.pytorch.org/whl/cpu FIXME: PyTorch current broken for Python3.13
39-
poetry run pytest -x --cov --cov-report=xml tests/unit/ tests/refactor/ -m 'not scenario' -c /dev/null -p no:warnings -n 0
33+
python -m pip install poetry
34+
poetry self add poetry-plugin-export
35+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
36+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
37+
python -m pip install -r requirements.txt
38+
python -m pip install .
39+
- name: Test with pytest
40+
env:
41+
SIMVUE_URL: ${{ secrets.SIMVUE_URL }}
42+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_TOKEN }}
43+
run: python -m pytest tests/ -x --cov --cov-report=xml -m 'not scenario' -c /dev/null -p no:warnings -n 0 -v
4044
- name: Upload coverage reports to Codecov
4145
run: |
4246
curl -Os https://uploader.codecov.io/latest/linux/codecov
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This workflow will install Python dependencies, run tests and lint with a single version of Python
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
3+
4+
name: Simvue Nightlies (Ubuntu)
5+
6+
on:
7+
workflow_dispatch:
8+
schedule:
9+
- cron: '30 0 * * *'
10+
11+
permissions:
12+
contents: read
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: true
17+
18+
jobs:
19+
build:
20+
21+
runs-on: ubuntu-latest
22+
timeout-minutes: 40
23+
steps:
24+
- uses: actions/checkout@v4
25+
- name: Set up Python 3.13
26+
uses: actions/setup-python@v5
27+
with:
28+
python-version: "3.13"
29+
- name: Install dependencies
30+
run: |
31+
python -m pip install poetry
32+
poetry self add poetry-plugin-export
33+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
34+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
35+
python -m pip install -r requirements.txt
36+
python -m pip install .
37+
- name: Test with pytest
38+
env:
39+
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
40+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
41+
run: python -m pytest tests/ -m 'not scenario'

.github/workflows/test_client_windows.yml

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Simvue Nightlies (Windows)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 0 * * *'
7+
8+
permissions:
9+
contents: read
10+
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.ref }}
13+
cancel-in-progress: true
14+
15+
jobs:
16+
build:
17+
runs-on: windows-latest
18+
timeout-minutes: 40
19+
strategy:
20+
matrix:
21+
python-version: ['3.12', '3.13']
22+
steps:
23+
- uses: actions/checkout@v4
24+
- name: Set up Python ${{ matrix.python-version }}
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "${{ matrix.python-version }}"
28+
- name: Install dependencies
29+
run: |
30+
rm poetry.lock
31+
python -m pip install poetry
32+
poetry self add poetry-plugin-export
33+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
34+
python -m pip install torch
35+
python -m pip install -r requirements.txt
36+
python -m pip install .
37+
- name: Test with pytest
38+
env:
39+
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
40+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
41+
run: python -m pytest tests/ -m 'not scenario' -m 'not unix'

.github/workflows/test_multiple_python.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
name: Simvue Client (Python Versions)
55

66
on:
7-
push:
8-
tags:
9-
- 'v*-*-rc*'
107
workflow_dispatch:
8+
schedule:
9+
- cron: '30 1 * * *'
1110

1211
permissions:
1312
contents: read
@@ -19,21 +18,26 @@ concurrency:
1918
jobs:
2019
build:
2120
runs-on: ubuntu-latest
22-
timeout-minutes: 30
21+
timeout-minutes: 40
2322
strategy:
2423
matrix:
2524
python-version: ['3.10', '3.11', '3.12']
2625
steps:
27-
- uses: actions/checkout@v3
26+
- uses: actions/checkout@v4
2827
- name: Set up Python ${{ matrix.python-version }}
29-
uses: actions/setup-python@v3
28+
uses: actions/setup-python@v5
3029
with:
3130
python-version: "${{ matrix.python-version }}"
3231
- name: Install dependencies
33-
run: python -m pip install poetry
34-
- name: Test with pytest
3532
run: |
36-
export SIMVUE_URL=${{ secrets.SIMVUE_URL }}
37-
export SIMVUE_TOKEN=${{ secrets.SIMVUE_TOKEN }}
38-
poetry install --all-extras
39-
poetry run pytest tests/unit/ tests/refactor/ -m 'not scenario'
33+
python -m pip install poetry
34+
poetry self add poetry-plugin-export
35+
poetry export -f requirements.txt --with dev -o requirements.txt --all-extras
36+
python -m pip install torch --index-url https://download.pytorch.org/whl/cpu
37+
python -m pip install -r requirements.txt
38+
python -m pip install .
39+
- name: Test with pytest
40+
env:
41+
SIMVUE_URL: ${{ secrets.SIMVUE_NIGHTLY_URL }}
42+
SIMVUE_TOKEN: ${{ secrets.SIMVUE_NIGHTLY_TOKEN }}
43+
run: python -m pytest tests/ -m 'not scenario'

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ dmypy.json
136136
simvue.ini
137137
simvue.toml
138138
offline/
139+
*.err
140+
*.out
139141

140142
# Pyenv
141143
.python-version

0 commit comments

Comments
 (0)