Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[codespell]
skip = **/package-lock.json
skip = **/package-lock.json,example/textmate/langs/**
11 changes: 0 additions & 11 deletions .flake8

This file was deleted.

106 changes: 57 additions & 49 deletions .github/workflows/test_and_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,77 +2,75 @@ name: Test and Release

on:
push:
branches: [ master ]
branches: [master]
pull_request:
branches: [ master ]
branches: [master]

jobs:
pre-commit:
runs-on: ubuntu-latest
env:
UV_PYTHON: "3.12"
steps:
- uses: actions/checkout@v2

- uses: actions/setup-python@v2
- uses: actions/checkout@v6
- name: Install uv
uses: astral-sh/setup-uv@v6
with:
python-version: "3.9"
version: "0.8.12"
enable-cache: true
- name: Install the project
run: uv sync --all-extras --dev

# Install and run pre-commit
- run: |
pip install pre-commit
pre-commit install
pre-commit run --all-files
uv run pre-commit install
uv run pre-commit run --all-files

pytest:
name: Pytest ${{ matrix.config.name }}
runs-on: ${{ matrix.config.os }}
strategy:
fail-fast: false
matrix:
python-version: [3.9]
python-version: ["3.12"]
config:
- {
name: "Linux",
os: ubuntu-latest
}
- {
name: "MacOSX",
os: macos-latest
}
- {
name: "Windows",
os: windows-latest
}
- { name: "Linux", os: ubuntu-latest }
- { name: "MacOSX", os: macos-latest }
- { name: "Windows", os: windows-latest }

defaults:
run:
shell: bash

steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Install and Run Tests
run: |
pip install .
pip install -r tests/requirements.txt
pytest -s ./tests
- name: Checkout
uses: actions/checkout@v6
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v6
with:
python-version: ${{ matrix.python-version }}
- name: Install uv
uses: astral-sh/setup-uv@v6
with:
version: "0.8.12"
enable-cache: true
- name: Install and Run Tests
run: |
uv sync --dev
uv pip install -r tests/requirements.txt
uv run pytest -s ./tests

test-npm-build:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v6

- name: Set Up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v6
with:
node-version: 14
node-version: 24

- name: Build Vue Components
run: |
Expand All @@ -81,24 +79,25 @@ jobs:
npm run build

release:
needs: [
pre-commit,
pytest,
test-npm-build,
]
needs: [pre-commit, pytest, test-npm-build]
runs-on: ubuntu-latest
environment: release
permissions:
id-token: write # IMPORTANT: mandatory for trusted publishing
contents: write # IMPORTANT: mandatory for making GitHub Releases
attestations: write # IMPORTANT: mandatory to attest build provenance
if: github.event_name == 'push'

steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v6
with:
fetch-depth: 0

- name: Set Up Node
uses: actions/setup-node@v3
uses: actions/setup-node@v6
with:
node-version: 14
node-version: 24

- name: Build Vue Components
run: |
Expand All @@ -107,8 +106,17 @@ jobs:
npm run build

- name: Python Semantic Release
uses: relekang/python-semantic-release@v7.34.6
id: release
uses: python-semantic-release/python-semantic-release@v10.5.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
repository_username: __token__
repository_password: ${{ secrets.PYPI_API_TOKEN }}

- name: Generate artifact attestation for sdist and wheel
if: steps.release.outputs.released == 'true'
uses: actions/attest-build-provenance@v4.1.0
with:
subject-path: "dist/*"

# https://docs.pypi.org/trusted-publishers/using-a-publisher/
- uses: pypa/gh-action-pypi-publish@release/v1
if: steps.release.outputs.released == 'true'
68 changes: 60 additions & 8 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,68 @@
ci:
autoupdate_commit_msg: "chore: update pre-commit hooks"
autofix_commit_msg: "style: pre-commit fixes"

exclude: ^.cruft.json|.copier-answers.yml$|uv\.lock$

repos:
- repo: https://github.com/psf/black
rev: 22.3.0
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: "v5.0.0"
hooks:
- id: check-added-large-files
- id: check-case-conflict
- id: check-merge-conflict
- id: check-symlinks
- id: check-yaml
- id: debug-statements
- id: end-of-file-fixer
- id: mixed-line-ending
- id: name-tests-test
args: ["--pytest-test-first"]
- id: requirements-txt-fixer
- id: trailing-whitespace

- repo: https://github.com/pre-commit/pygrep-hooks
rev: "v1.10.0"
hooks:
- id: rst-backticks
- id: rst-directive-colons
- id: rst-inline-touching-normal

- repo: https://github.com/rbubley/mirrors-prettier
rev: "v3.4.2"
hooks:
- id: black
entry: black --check
- id: prettier
types_or: [yaml, markdown, html, css, scss, javascript, json]
args: [--prose-wrap=always]

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.15.10"
hooks:
- id: ruff
args: ["--fix", "--show-fixes"]
- id: ruff-format

- repo: https://github.com/codespell-project/codespell
rev: v2.1.0
rev: "v2.3.0"
hooks:
- id: codespell

- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: "v0.10.0.1"
hooks:
- id: shellcheck

- repo: https://github.com/abravalheri/validate-pyproject
rev: "v0.25"
hooks:
- id: validate-pyproject
additional_dependencies:
- validate-pyproject[all]
- validate-pyproject-schema-store

- repo: https://github.com/python-jsonschema/check-jsonschema
rev: "0.31.0"
hooks:
- id: flake8
- id: check-dependabot
- id: check-github-workflows
- id: check-readthedocs
54 changes: 38 additions & 16 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,62 @@

### Fix

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* Update vue2 example to use vue2 client type ([`34b443d`](https://github.com/Kitware/trame-code/commit/34b443d4b02328db155a4e152516d312dbfa7090))
* Initial value for vue2 ([`b356e66`](https://github.com/Kitware/trame-code/commit/b356e66608b7b0655bffa4022c8f9815ceffcdbf))
* Bring back vue2 support ([`d9dc6f8`](https://github.com/Kitware/trame-code/commit/d9dc6f8fe0d393e596a0eeb4a0d20d32e5aa6681))
* Update to use modelValue for vue3 ([`4274d8f`](https://github.com/Kitware/trame-code/commit/4274d8f8221c2bc2f3052900186444ca8dab6af0))
- Update vue2 example to use vue2 client type
([`34b443d`](https://github.com/Kitware/trame-code/commit/34b443d4b02328db155a4e152516d312dbfa7090))
- Initial value for vue2
([`b356e66`](https://github.com/Kitware/trame-code/commit/b356e66608b7b0655bffa4022c8f9815ceffcdbf))
- Bring back vue2 support
([`d9dc6f8`](https://github.com/Kitware/trame-code/commit/d9dc6f8fe0d393e596a0eeb4a0d20d32e5aa6681))
- Update to use modelValue for vue3
([`4274d8f`](https://github.com/Kitware/trame-code/commit/4274d8f8221c2bc2f3052900186444ca8dab6af0))

### Documentation

* Remove value from python wrapper ([`9172e3b`](https://github.com/Kitware/trame-code/commit/9172e3b87a3959dee4df5bcbbf912576a5bbd459))
* Update README.rst ([`adc54bb`](https://github.com/Kitware/trame-code/commit/adc54bb796288d91b8b9d89c8140b24e7b372e1f))
- Remove value from python wrapper
([`9172e3b`](https://github.com/Kitware/trame-code/commit/9172e3b87a3959dee4df5bcbbf912576a5bbd459))
- Update README.rst
([`adc54bb`](https://github.com/Kitware/trame-code/commit/adc54bb796288d91b8b9d89c8140b24e7b372e1f))

## v1.0.1 (2023-08-16)

### Fix

* **docs:** Improve API ([`e125a5b`](https://github.com/Kitware/trame-code/commit/e125a5b03ea7518329adadb082fc4f142fd6f28e))
- **docs:** Improve API
([`e125a5b`](https://github.com/Kitware/trame-code/commit/e125a5b03ea7518329adadb082fc4f142fd6f28e))

### Documentation

* **layout:** Use automaticLayout option ([`c416d98`](https://github.com/Kitware/trame-code/commit/c416d98d2827e06d0a281733186016d6dbee98ca))
* **example:** Cleanup of textmate ([`d2e3eb3`](https://github.com/Kitware/trame-code/commit/d2e3eb322bef5574b2ae5ab0971d43c4a8335cd7))
- **layout:** Use automaticLayout option
([`c416d98`](https://github.com/Kitware/trame-code/commit/c416d98d2827e06d0a281733186016d6dbee98ca))
- **example:** Cleanup of textmate
([`d2e3eb3`](https://github.com/Kitware/trame-code/commit/d2e3eb322bef5574b2ae5ab0971d43c4a8335cd7))

## v1.0.0 (2023-04-19)

### Feature
* **release:** Official release ([`080923c`](https://github.com/Kitware/trame-code/commit/080923c5ad7343dac65e192902947ed08f761f57))

- **release:** Official release
([`080923c`](https://github.com/Kitware/trame-code/commit/080923c5ad7343dac65e192902947ed08f761f57))

### Breaking
* Just making that library official now that it vue2/3 compatible ([`080923c`](https://github.com/Kitware/trame-code/commit/080923c5ad7343dac65e192902947ed08f761f57))

- Just making that library official now that it vue2/3 compatible
([`080923c`](https://github.com/Kitware/trame-code/commit/080923c5ad7343dac65e192902947ed08f761f57))

## v0.1.0 (2023-04-18)

### Feature
* **textmate:** Handle textmate format ([`83cfb97`](https://github.com/Kitware/trame-code/commit/83cfb97110296afa5fbfd31a2d66a4c8dc9810d1))
* **vue23:** Working for both vue client ([`13b5a92`](https://github.com/Kitware/trame-code/commit/13b5a92851a3f73f6020626547e63a7c4887cead))
* Initial VS code editor ([`831f907`](https://github.com/Kitware/trame-code/commit/831f90763d6a37088a648b2948f7f4b80b6c81aa))

- **textmate:** Handle textmate format
([`83cfb97`](https://github.com/Kitware/trame-code/commit/83cfb97110296afa5fbfd31a2d66a4c8dc9810d1))
- **vue23:** Working for both vue client
([`13b5a92`](https://github.com/Kitware/trame-code/commit/13b5a92851a3f73f6020626547e63a7c4887cead))
- Initial VS code editor
([`831f907`](https://github.com/Kitware/trame-code/commit/831f90763d6a37088a648b2948f7f4b80b6c81aa))

### Fix
* **version:** Add __version__ ([`efac4ab`](https://github.com/Kitware/trame-code/commit/efac4abe7c61c0ce562e88c54461d3a19b1e553d))
* **options:** Fix setting the language and theme ([`4ae0c42`](https://github.com/Kitware/trame-code/commit/4ae0c42055df982181453371ae76dd9e5677b451))

- **version:** Add **version**
([`efac4ab`](https://github.com/Kitware/trame-code/commit/efac4abe7c61c0ce562e88c54461d3a19b1e553d))
- **options:** Fix setting the language and theme
([`4ae0c42`](https://github.com/Kitware/trame-code/commit/4ae0c42055df982181453371ae76dd9e5677b451))
1 change: 0 additions & 1 deletion MANIFEST.in

This file was deleted.

1 change: 1 addition & 0 deletions example/language-features/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import jedi
from trame.app import TrameApp
from trame.ui.vuetify3 import SinglePageLayout

from trame.widgets import code
from trame.widgets import vuetify3 as v3

Expand Down
4 changes: 2 additions & 2 deletions example/language-features/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
jedi
trame
trame-vuetify
trame-code
jedi
trame-vuetify
1 change: 1 addition & 0 deletions example/live-state/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

from trame.app import TrameApp
from trame.ui.vuetify3 import SinglePageLayout

from trame.widgets import code
from trame.widgets import vuetify3 as vuetify

Expand Down
2 changes: 1 addition & 1 deletion example/live-state/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
trame
trame-vuetify
trame-code
trame-vuetify
2 changes: 1 addition & 1 deletion example/read-only/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
trame
trame-code
trame-code
Loading
Loading