Skip to content

Commit

Permalink
Merge pull request #701 from OCA/18.0-ocabot-update-dotfiles
Browse files Browse the repository at this point in the history
[18.0] dotfiles update needs manual intervention
  • Loading branch information
guewen authored Oct 21, 2024
2 parents e767691 + 4e81e3b commit 1bfdd18
Show file tree
Hide file tree
Showing 15 changed files with 273 additions and 246 deletions.
2 changes: 1 addition & 1 deletion .copier-answers.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.26
_commit: v1.27
_src_path: git+https://github.com/OCA/oca-addons-repo-template
additional_ruff_rules: []
ci: GitHub
Expand Down
188 changes: 0 additions & 188 deletions .eslintrc.yml

This file was deleted.

34 changes: 22 additions & 12 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exclude: |
# Files and folders generated by bots, to avoid loops
^setup/|/static/description/index\.html$|
# We don't want to mess with tool-generated files
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
# Maybe reactivate this when all README files include prettier ignore tags?
^README\.md$|
# Library files can have extraneous formatting (even minimized)
Expand All @@ -22,7 +22,7 @@ exclude: |
(LICENSE.*|COPYING.*)
default_language_version:
python: python3
node: "16.17.0"
node: "22.9.0"
repos:
- repo: local
hooks:
Expand Down Expand Up @@ -66,25 +66,35 @@ repos:
- id: oca-checks-po
args:
- --disable=po-pretty-format
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
- repo: local
hooks:
- id: prettier
name: prettier (with plugin-xml)
additional_dependencies:
- "[email protected]"
- "@prettier/[email protected]"
entry: prettier
args:
- --plugin=@prettier/plugin-xml
- --write
- --list-different
- --ignore-unknown
types: [text]
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.24.0
language: node
additional_dependencies:
- "[email protected]"
- "@prettier/[email protected]"
- repo: local
hooks:
- id: eslint
verbose: true
name: eslint
entry: eslint
args:
- --color
- --fix
verbose: true
types: [javascript]
language: node
additional_dependencies:
- "[email protected]"
- "[email protected]"
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
Expand Down Expand Up @@ -114,7 +124,7 @@ repos:
args: [--fix, --exit-non-zero-on-fix]
- id: ruff-format
- repo: https://github.com/OCA/pylint-odoo
rev: v9.0.4
rev: v9.1.3
hooks:
- id: pylint_odoo
name: pylint with optional checks
Expand Down
8 changes: 0 additions & 8 deletions .prettierrc.yml

This file was deleted.

Loading

0 comments on commit 1bfdd18

Please sign in to comment.