Skip to content

Commit a245a7c

Browse files
authored
Merge branch 'Kitware:master' into maintenance
2 parents 895c173 + ce0e2ed commit a245a7c

7 files changed

Lines changed: 4010 additions & 54 deletions

File tree

.codespellrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[codespell]
2-
skip = CHANGELOG.md,src/trame_vtk/modules/vtk/serializers/data.py,src/trame_vtk/modules/vtk/serializers/actors.py
2+
skip = CHANGELOG.md,src/trame_vtk/modules/vtk/serializers/data.py,src/trame_vtk/modules/vtk/serializers/actors.py,src/trame_vtk/tools/static_viewer.html,src/trame_vtk/modules/common/serve/trame-vtk.js

.externals.sha256

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
cda41af6756c5cad8b9be1c45c849cd9cb9bfbaaf507002f8bbb8570ddfb7c53 ./src/trame_vtk/tools/static_viewer.html
1+
d6e1d6ca32dd252f4c46d1b5c7ab1225f66990da50215b9de91912bbf7aa97ed ./src/trame_vtk/tools/static_viewer.html
22
948b0cca167bc2e2315a4d1ef18eb23cbe5979c806fbb7f0b157ed7c0e5ed280 ./src/trame_vtk/modules/common/serve/trame-vtk.js

.github/workflows/test_and_release.yml

Lines changed: 51 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Test and Release
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66
pull_request:
7-
branches: [ master ]
7+
branches: [master]
88

99
jobs:
1010
pre-commit:
@@ -30,10 +30,7 @@ jobs:
3030
matrix:
3131
python-version: ["3.12"]
3232
config:
33-
- {
34-
name: "Linux",
35-
os: ubuntu-latest
36-
}
33+
- { name: "Linux", os: ubuntu-latest }
3734
# - {
3835
# name: "MacOSX",
3936
# os: macos-latest
@@ -48,50 +45,54 @@ jobs:
4845
shell: bash
4946

5047
steps:
51-
- name: Checkout
52-
uses: actions/checkout@v2
53-
54-
- name: Set up Python ${{ matrix.python-version }}
55-
uses: actions/setup-python@v2
56-
with:
57-
python-version: ${{ matrix.python-version }}
58-
59-
- name: Install trame-vtk.js
60-
run: |
61-
bash .fetch_externals.sh
62-
63-
- name: Install dependencies
64-
run: |
65-
pip install .[dev]
66-
pip install -r tests/requirements.txt
67-
playwright install
68-
69-
- name: Install OSMesa for Linux
70-
if: matrix.config.os == 'ubuntu-latest'
71-
run: |
72-
sudo apt-get update
73-
sudo apt-get install -y libosmesa6-dev
74-
75-
- name: Run Tests
76-
run: |
77-
# Run the tests with coverage so we get a coverage report too
78-
coverage run --source . -m pytest ./tests
79-
# Print the coverage report
80-
coverage report -m
81-
82-
- name: Upload Coverage to Codecov
83-
uses: codecov/codecov-action@v3
84-
85-
- name: Upload pytest test results
86-
uses: actions/upload-artifact@v4
87-
if: always()
88-
with:
89-
name: pytest-results-${{ matrix.config.name }}
90-
path: |
91-
tests/refs/*.yml
92-
tests/refs/**/*.png
93-
assets/**
94-
retention-days: 1
48+
- name: Checkout
49+
uses: actions/checkout@v2
50+
51+
- name: Set up Python ${{ matrix.python-version }}
52+
uses: actions/setup-python@v2
53+
with:
54+
python-version: ${{ matrix.python-version }}
55+
56+
# -----------------------------------------------------------------------
57+
# Make that step a manual one and pushing files to the repo
58+
# -----------------------------------------------------------------------
59+
# - name: Install trame-vtk.js
60+
# run: |
61+
# bash .fetch_externals.sh
62+
# -----------------------------------------------------------------------
63+
64+
- name: Install dependencies
65+
run: |
66+
pip install .[dev]
67+
pip install -r tests/requirements.txt
68+
playwright install
69+
70+
- name: Install OSMesa for Linux
71+
if: matrix.config.os == 'ubuntu-latest'
72+
run: |
73+
sudo apt-get update
74+
sudo apt-get install -y libosmesa6-dev
75+
76+
- name: Run Tests
77+
run: |
78+
# Run the tests with coverage so we get a coverage report too
79+
coverage run --source . -m pytest ./tests
80+
# Print the coverage report
81+
coverage report -m
82+
83+
- name: Upload Coverage to Codecov
84+
uses: codecov/codecov-action@v3
85+
86+
- name: Upload pytest test results
87+
uses: actions/upload-artifact@v4
88+
if: always()
89+
with:
90+
name: pytest-results-${{ matrix.config.name }}
91+
path: |
92+
tests/refs/*.yml
93+
tests/refs/**/*.png
94+
assets/**
95+
retention-days: 1
9596

9697
release:
9798
needs: [pre-commit, pytest]
@@ -104,7 +105,6 @@ jobs:
104105
id-token: write # IMPORTANT: mandatory for trusted publishing
105106
contents: write # IMPORTANT: mandatory for making GitHub Releases
106107

107-
108108
steps:
109109
- name: Checkout
110110
uses: actions/checkout@v4

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# CHANGELOG
22

33

4+
## v2.11.7 (2026-04-13)
5+
6+
### Bug Fixes
7+
8+
- **static_viewer**: Include in repo to skip auto fetch on vtk.js
9+
([`9302c6b`](https://github.com/Kitware/trame-vtk/commit/9302c6b0309e3961323aea882621ac8922d59524))
10+
11+
412
## v2.11.6 (2026-03-25)
513

614
### Bug Fixes

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "trame-vtk"
3-
version = "2.11.6"
3+
version = "2.11.7"
44
description = "VTK widgets for trame"
55
authors = [{ name = "Kitware Inc." }]
66
dependencies = ["trame-client>=3.4,<4"]

src/trame_vtk/modules/common/serve/trame-vtk.js

Lines changed: 3928 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/trame_vtk/tools/static_viewer.html

Lines changed: 20 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)