Skip to content

Commit 566b942

Browse files
Jo-ByrJo-Byr
committed
chore: update pre-commit
Update pre-commit configuration to align with latest trame standards
1 parent c5c2feb commit 566b942

53 files changed

Lines changed: 16919 additions & 722 deletions

Some content is hidden

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

‎.codecov.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ comment: false
22
coverage:
33
status:
44
project: off
5-
patch: off
5+
patch: off

‎.coveragerc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[run]
2-
omit = *docs*, *tests*, setup.py
2+
omit = *docs*, *tests*, setup.py

‎.github/workflows/test_and_release.yml‎

Lines changed: 43 additions & 46 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.9"]
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,45 +45,45 @@ jobs:
4845
shell: bash
4946

5047
steps:
51-
- name: Checkout
52-
uses: actions/checkout@v6
53-
54-
- name: Set up Python ${{ matrix.python-version }}
55-
uses: actions/setup-python@v5
56-
with:
57-
python-version: ${{ matrix.python-version }}
58-
59-
- name: Set Up Node
60-
uses: actions/setup-node@v6
61-
with:
62-
node-version: 24
63-
64-
- name: Build Vue2 App
65-
run: |
66-
cd vue2-app
67-
npm ci
68-
npm run build
69-
70-
- name: Build Vue3 App
71-
run: |
72-
cd vue3-app
73-
npm ci
74-
npm run build
75-
76-
- name: Install and Run Tests
77-
run: |
78-
pip install .
79-
pip install -r tests/requirements.txt
80-
# Install requirements for playwright
81-
playwright install
82-
# Run the tests with coverage so we get a coverage report too
83-
pip install coverage
84-
coverage run --source . -m pytest -s .
85-
# Print the coverage report
86-
coverage report -m
87-
88-
- name: Upload Coverage to Codecov
89-
uses: codecov/codecov-action@v3
48+
- name: Checkout
49+
uses: actions/checkout@v6
50+
51+
- name: Set up Python ${{ matrix.python-version }}
52+
uses: actions/setup-python@v5
53+
with:
54+
python-version: ${{ matrix.python-version }}
55+
56+
- name: Set Up Node
57+
uses: actions/setup-node@v6
58+
with:
59+
node-version: 24
60+
61+
- name: Build Vue2 App
62+
run: |
63+
cd vue2-app
64+
npm ci
65+
npm run build
66+
67+
- name: Build Vue3 App
68+
run: |
69+
cd vue3-app
70+
npm ci
71+
npm run build
72+
73+
- name: Install and Run Tests
74+
run: |
75+
pip install .
76+
pip install -r tests/requirements.txt
77+
# Install requirements for playwright
78+
playwright install
79+
# Run the tests with coverage so we get a coverage report too
80+
pip install coverage
81+
coverage run --source . -m pytest -s .
82+
# Print the coverage report
83+
coverage report -m
84+
85+
- name: Upload Coverage to Codecov
86+
uses: codecov/codecov-action@v3
9087

9188
test-npm-build:
9289
runs-on: ubuntu-latest
@@ -99,7 +96,7 @@ jobs:
9996
uses: actions/setup-node@v6
10097
with:
10198
node-version: 24
102-
99+
103100
- name: Build js-lib
104101
run: |
105102
cd js-lib

‎.pre-commit-config.yaml‎

Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,69 @@
1+
ci:
2+
autoupdate_commit_msg: "chore: update pre-commit hooks"
3+
autofix_commit_msg: "style: pre-commit fixes"
4+
5+
exclude: ^.*\.md$
6+
17
repos:
2-
- repo: https://github.com/codespell-project/codespell
3-
rev: v2.1.0
8+
- repo: https://github.com/pre-commit/pre-commit-hooks
9+
rev: "v6.0.0"
410
hooks:
5-
- id: codespell
11+
- id: check-added-large-files
12+
- id: check-case-conflict
13+
- id: check-merge-conflict
14+
- id: check-symlinks
15+
- id: check-yaml
16+
- id: debug-statements
17+
- id: end-of-file-fixer
18+
exclude: ^trame_server/LICENSE$
19+
- id: mixed-line-ending
20+
- id: name-tests-test
21+
args: ["--pytest-test-first"]
22+
- id: requirements-txt-fixer
23+
- id: trailing-whitespace
24+
25+
- repo: https://github.com/pre-commit/pygrep-hooks
26+
rev: "v1.10.0"
27+
hooks:
28+
- id: rst-backticks
29+
- id: rst-directive-colons
30+
- id: rst-inline-touching-normal
31+
32+
- repo: https://github.com/rbubley/mirrors-prettier
33+
rev: "v3.8.3"
34+
hooks:
35+
- id: prettier
36+
types_or: [yaml, markdown, html, css, scss, javascript, json]
37+
args: [--prose-wrap=always]
638

739
- repo: https://github.com/astral-sh/ruff-pre-commit
8-
rev: v0.8.4
40+
rev: "v0.15.11"
941
hooks:
1042
- id: ruff
11-
- id: ruff-format
43+
args: ["--fix", "--show-fixes"]
44+
- id: ruff-format
45+
46+
- repo: https://github.com/codespell-project/codespell
47+
rev: "v2.4.2"
48+
hooks:
49+
- id: codespell
50+
51+
- repo: https://github.com/shellcheck-py/shellcheck-py
52+
rev: "v0.11.0.1"
53+
hooks:
54+
- id: shellcheck
55+
56+
- repo: https://github.com/abravalheri/validate-pyproject
57+
rev: "v0.25"
58+
hooks:
59+
- id: validate-pyproject
60+
additional_dependencies:
61+
- validate-pyproject[all]
62+
- validate-pyproject-schema-store
63+
64+
- repo: https://github.com/python-jsonschema/check-jsonschema
65+
rev: "0.37.1"
66+
hooks:
67+
- id: check-dependabot
68+
- id: check-github-workflows
69+
- id: check-readthedocs

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21-
THE SOFTWARE.
21+
THE SOFTWARE.

‎examples/launcher/run_retry.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env bash
2+
13
export TRAME_CLIENT_TYPE=vue3
24

35
rm -rf ./www/

‎examples/loading/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
loading
1+
loading

‎examples/loading/loading_launcher.json‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,29 @@
1-
21
{
3-
"configuration": {
4-
"host" : "localhost",
5-
"port" : 8080,
6-
"endpoint": "paraview",
7-
"content": "loading/loading_www",
8-
"proxy_file" : "loading/proxy-mapping.txt",
9-
"sessionURL" : "ws://${host}:${port}/ws",
10-
"timeout" : 50,
11-
"log_dir" : "loading",
12-
"fields" : []
13-
},
14-
"resources" : [ { "host" : "localhost", "port_range" : [9001, 9020] } ],
15-
"properties" : {},
16-
"apps" : {
17-
"trame" : {
18-
"cmd" : ["python", "loading.py", "--port", "$port", "--server", "--authKey", "${secret}"],
19-
"ready_line" : "App running at"
20-
}
2+
"configuration": {
3+
"host": "localhost",
4+
"port": 8080,
5+
"endpoint": "paraview",
6+
"content": "loading/loading_www",
7+
"proxy_file": "loading/proxy-mapping.txt",
8+
"sessionURL": "ws://${host}:${port}/ws",
9+
"timeout": 50,
10+
"log_dir": "loading",
11+
"fields": []
12+
},
13+
"resources": [{ "host": "localhost", "port_range": [9001, 9020] }],
14+
"properties": {},
15+
"apps": {
16+
"trame": {
17+
"cmd": [
18+
"python",
19+
"loading.py",
20+
"--port",
21+
"$port",
22+
"--server",
23+
"--authKey",
24+
"${secret}"
25+
],
26+
"ready_line": "App running at"
2127
}
22-
}
28+
}
29+
}

‎examples/loading/run_loading.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
#!/usr/bin/env bash
2+
13
# export TRAME_CLIENT_TYPE=vue2
24
export TRAME_CLIENT_TYPE=vue3
35

46
rm -rf ./loading/
57
mkdir -p ./loading/loading_www
68
python -m trame.tools.www --client-type "$TRAME_CLIENT_TYPE" --output ./loading/loading_www
7-
python -m wslink.launcher ./loading_launcher.json
9+
python -m wslink.launcher ./loading_launcher.json

‎js-lib/.eslintrc.cjs‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@ require("@rushstack/eslint-patch/modern-module-resolution");
33

44
module.exports = {
55
root: true,
6-
extends: [
7-
"eslint:recommended",
8-
"@vue/eslint-config-prettier",
9-
],
10-
env : {
11-
browser : true,
12-
es6 : true,
6+
extends: ["eslint:recommended", "@vue/eslint-config-prettier"],
7+
env: {
8+
browser: true,
9+
es6: true,
1310
},
14-
rules : {
15-
"no-unused-vars" : 2,
16-
"no-undef" : 2
11+
rules: {
12+
"no-unused-vars": 2,
13+
"no-undef": 2,
1714
},
1815
parserOptions: {
1916
sourceType: "module",

0 commit comments

Comments
 (0)