Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Update frontend and pre-commit versions #32

Merged
merged 1 commit into from
Sep 11, 2024
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
60 changes: 31 additions & 29 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ default_install_hook_types: [commit-msg, pre-commit]
default_stages: [commit, merge-commit]
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-added-large-files
- id: check-ast
Expand All @@ -26,7 +26,7 @@ repos:
- id: fix-byte-order-marker
- id: trailing-whitespace
- repo: https://github.com/psf/black-pre-commit-mirror
rev: 24.1.0
rev: 24.8.0
hooks:
- id: black
- repo: https://github.com/PyCQA/isort
Expand All @@ -43,24 +43,24 @@ repos:
rev: 6.3.0
hooks:
- id: pydocstyle
exclude: "^tests/"
exclude: '^tests/'
additional_dependencies:
- pydocstyle[toml]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v1.8.0
rev: v1.11.2
hooks:
- id: mypy
additional_dependencies:
- capellambse==0.5.70
- types-pyyaml==6.0.11
- repo: https://github.com/pylint-dev/pylint
rev: v3.1.0
rev: v3.2.7
hooks:
- id: pylint
require_serial: false
args: [-rn, -sn, -dfixme, -dduplicate-code]
- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.5.4
rev: v1.5.5
hooks:
- id: insert-license
name: Insert license headers (shell-style comments)
Expand All @@ -71,7 +71,7 @@ repos:
- --license-filepath
- LICENSES/.license_header.txt
- --comment-style
- "#"
- '#'
- id: insert-license
name: Insert license headers (XML-style comments)
files: '\.(?:html|md|xml)$'
Expand All @@ -81,7 +81,7 @@ repos:
- --license-filepath
- LICENSES/.license_header.txt
- --comment-style
- "<!--| ~| -->"
- '<!--| ~| -->'
- id: insert-license
name: Insert license headers (C-style comments)
files: '\.(?:css|js|ts)$'
Expand All @@ -91,7 +91,7 @@ repos:
- --license-filepath
- LICENSES/.license_header.txt
- --comment-style
- "/*| *| */"
- '/*| *| */'
- id: insert-license
name: Insert license headers (reST comments)
files: '\.rst$'
Expand All @@ -101,7 +101,7 @@ repos:
- --license-filepath
- LICENSES/.license_header.txt
- --comment-style
- "..| |"
- '..| |'
- id: insert-license
name: Insert license headers (JSX files)
files: '\.jsx$'
Expand All @@ -111,37 +111,39 @@ repos:
- --license-filepath
- LICENSES/.license_header.txt
- --comment-style
- "//"
- '//'
- repo: https://github.com/fsfe/reuse-tool
rev: v3.0.1
rev: v4.0.3
hooks:
- id: reuse
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.11.0
rev: v9.17.0
hooks:
- id: commitlint
stages: [commit-msg]
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
- repo: local
hooks:
- id: prettier
name: prettier
entry: prettier --write
language: node
types_or: [ts, css, html, markdown]
additional_dependencies:
- "prettier@^3.2.5"
- "prettier-plugin-tailwindcss@^0.5.14"
- "tailwind-scrollbar@^3.1.0"
- 'prettier@^3.3.3'
- 'prettier-plugin-tailwindcss@^0.6.6'
- 'tailwind-scrollbar@^3.1.0'
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v9.2.0
rev: v9.10.0
hooks:
- id: eslint
additional_dependencies:
- "eslint@^8.57.0"
- "eslint-config-prettier@^9.1.0"
- "eslint-plugin-import@^2.29.1"
- "eslint-plugin-unused-imports@^3.1.0"
- "eslint-plugin-deprecation@^2.0.0"
- "eslint-plugin-tailwindcss@^3.15.1"
- "eslint-plugin-storybook@^0.8.0"
- "eslint-plugin-react@^7.34.1"
- "eslint-plugin-react-hooks@^4.6.2"
- "eslint-plugin-react-refresh@^0.4.5"
- 'eslint@^8.57.0'
- 'eslint-config-prettier@^9.1.0'
- 'eslint-plugin-import@^2.29.1'
- 'eslint-plugin-unused-imports@^3.1.0'
- 'eslint-plugin-deprecation@^2.0.0'
- 'eslint-plugin-tailwindcss@^3.15.1'
- 'eslint-plugin-storybook@^0.8.0'
- 'eslint-plugin-react@^7.34.1'
- 'eslint-plugin-react-hooks@^4.6.2'
- 'eslint-plugin-react-refresh@^0.4.5'
11 changes: 5 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Thanks for your interest in our project. Contributions are always welcome!
We are committed to fostering a welcoming, respectful, and harassment-free
environment. Be kind!

If you have questions, ideas or want to report a bug, feel free to [open an
issue]. Or go ahead and [open a pull request] to contribute code. In order to
reduce the burden on our maintainers, please make sure that your code follows
our style guidelines outlined below.
If you have questions, ideas or want to report a bug, feel free to [open
an issue]. Or go ahead and [open a pull request] to contribute code. In order to
reduce the burden on our maintainers, please make sure that your code follows our
style guidelines outlined below.

<!-- prettier-ignore -->
[open an issue]: https://github.com/DSD-DBS/capella-model-explorer/issues
Expand Down Expand Up @@ -129,8 +129,7 @@ The key differences are:
etc.
- For classes that are not builtin (e.g. `Iterable`),
`import collections.abc as cabc` and then use them like `cabc.Iterable`.
- Use [PEP-604-style unions], e.g. `int | float` instead of
`t.Union[int, float]`.
- Use [PEP-604-style unions], e.g. `int | float` instead of `t.Union[int, float]`.
- Use `... | None` (with `None` always as the last union member) instead of
`t.Optional[...]` and always explicitly annotate where `None` is possible.

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ Navigate to `Menu` > `Settings` > `Tools` > `Add a new tool` and fill in the
following configuration:

```yaml
name: 'Capella model explorer'
name: "Capella model explorer"
integrations:
t4c: false
pure_variants: false
Expand All @@ -119,8 +119,8 @@ config:
environment:
MODEL_ENTRYPOINT:
stage: before
value: '{CAPELLACOLLAB_SESSION_PROVISIONING[0][path]}'
ROUTE_PREFIX: '{CAPELLACOLLAB_SESSIONS_BASE_PATH}'
value: "{CAPELLACOLLAB_SESSION_PROVISIONING[0][path]}"
ROUTE_PREFIX: "{CAPELLACOLLAB_SESSIONS_BASE_PATH}"
connection:
methods:
- id: f51872a8-1a4f-4a4d-b4f4-b39cbd31a75b
Expand All @@ -131,7 +131,7 @@ config:
ports:
metrics: 8000
http: 8000
redirect_url: '{CAPELLACOLLAB_SESSIONS_SCHEME}://{CAPELLACOLLAB_SESSIONS_HOST}:{CAPELLACOLLAB_SESSIONS_PORT}{CAPELLACOLLAB_SESSIONS_BASE_PATH}/'
redirect_url: "{CAPELLACOLLAB_SESSIONS_SCHEME}://{CAPELLACOLLAB_SESSIONS_HOST}:{CAPELLACOLLAB_SESSIONS_PORT}{CAPELLACOLLAB_SESSIONS_BASE_PATH}/"
monitoring:
prometheus:
path: /metrics
Expand All @@ -149,7 +149,7 @@ Since the Capella Model Explorer can load different Capella versions, we can
use one generic version:

```yaml
name: 'Generic'
name: "Generic"
config:
is_recommended: true
is_deprecated: false
Expand Down
3 changes: 0 additions & 3 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,3 @@ dist-ssr
*.njsproj
*.sln
*.sw?

# Package
package-lock.json
Loading
Loading