Skip to content

Commit b485fd6

Browse files
Merge pull request #614 from ForgeFlow/17.0-fix-pre_commit
[17.0][FIX] Update copier template
2 parents aa0dfac + 797ea7e commit b485fd6

File tree

8 files changed

+39
-22
lines changed

8 files changed

+39
-22
lines changed

.copier-answers.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.24
2+
_commit: v1.29
33
_src_path: https://github.com/OCA/oca-addons-repo-template.git
44
additional_ruff_rules: []
55
ci: GitHub
66
convert_readme_fragments_to_markdown: true
7+
enable_checklog_odoo: false
78
generate_requirements_txt: true
89
github_check_license: true
910
github_ci_extra_env: {}

.github/workflows/pre-commit.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
pre-commit:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v3
17-
- uses: actions/setup-python@v2
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-python@v5
1818
with:
1919
python-version: "3.11"
2020
- name: Get python version
2121
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
22-
- uses: actions/cache@v1
22+
- uses: actions/cache@v4
2323
with:
2424
path: ~/.cache/pre-commit
2525
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
name: Detect unreleased dependencies
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
- run: |
1919
for reqfile in requirements.txt test-requirements.txt ; do
2020
if [ -f ${reqfile} ] ; then
@@ -48,7 +48,7 @@ jobs:
4848
ports:
4949
- 5432:5432
5050
steps:
51-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
5252
with:
5353
persist-credentials: false
5454
- name: Install addons and dependencies

.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ var/
2525
*.egg
2626
*.eggs
2727

28+
# Windows installers
29+
*.msi
30+
2831
# Debian packages
2932
*.deb
3033

@@ -33,6 +36,7 @@ var/
3336

3437
# MacOS packages
3538
*.dmg
39+
*.pkg
3640

3741
# Installer logs
3842
pip-log.txt

.pre-commit-config.yaml

+22-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exclude: |
55
# Files and folders generated by bots, to avoid loops
66
^setup/|/static/description/index\.html$|
77
# We don't want to mess with tool-generated files
8-
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
8+
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
99
# Maybe reactivate this when all README files include prettier ignore tags?
1010
^README\.md$|
1111
# Library files can have extraneous formatting (even minimized)
@@ -39,7 +39,7 @@ repos:
3939
language: fail
4040
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
4141
- repo: https://github.com/sbidoul/whool
42-
rev: v0.5
42+
rev: v1.2
4343
hooks:
4444
- id: whool-init
4545
- repo: https://github.com/oca/maintainer-tools
@@ -64,25 +64,37 @@ repos:
6464
hooks:
6565
- id: oca-checks-odoo-module
6666
- id: oca-checks-po
67-
- repo: https://github.com/pre-commit/mirrors-prettier
68-
rev: v2.7.1
67+
args:
68+
- --disable=po-pretty-format
69+
- repo: local
6970
hooks:
7071
- id: prettier
7172
name: prettier (with plugin-xml)
73+
entry: prettier
74+
args:
75+
- --write
76+
- --list-different
77+
- --ignore-unknown
78+
types: [text]
79+
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
80+
language: node
7281
additional_dependencies:
7382
- "prettier@2.7.1"
7483
- "@prettier/plugin-xml@2.2.0"
75-
args:
76-
- --plugin=@prettier/plugin-xml
77-
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
78-
- repo: https://github.com/pre-commit/mirrors-eslint
79-
rev: v8.24.0
84+
- repo: local
8085
hooks:
8186
- id: eslint
82-
verbose: true
87+
name: eslint
88+
entry: eslint
8389
args:
8490
- --color
8591
- --fix
92+
verbose: true
93+
types: [javascript]
94+
language: node
95+
additional_dependencies:
96+
- "eslint@8.24.0"
97+
- "eslint-plugin-jsdoc@"
8698
- repo: https://github.com/pre-commit/pre-commit-hooks
8799
rev: v4.3.0
88100
hooks:

.ruff.toml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ extend-select = [
1010
"I", # isort
1111
"UP", # pyupgrade
1212
]
13+
extend-safe-fixes = ["UP008"]
1314
exclude = ["setup/*"]
1415

1516
[format]

rma_filter_lot/README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ Authors
5252
Contributors
5353
------------
5454

55-
- Mateu Griful <mateu.griful@forgeflow.com>
56-
- Lois Rilo <lois.rilo@forgeflow.com>
55+
- Mateu Griful <mateu.griful@forgeflow.com>
56+
- Lois Rilo <lois.rilo@forgeflow.com>
5757

5858
Maintainers
5959
-----------

rma_filter_lot/static/description/index.html

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88

99
/*
1010
:Author: David Goodger (goodger@python.org)
11-
:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
11+
:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
1212
:Copyright: This stylesheet has been placed in the public domain.
1313
1414
Default cascading style sheet for the HTML output of Docutils.
15-
Despite the name, some widely supported CSS2 features are used.
1615
1716
See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
1817
customize this style sheet.
@@ -275,7 +274,7 @@
275274
margin-left: 2em ;
276275
margin-right: 2em }
277276

278-
pre.code .ln { color: gray; } /* line numbers */
277+
pre.code .ln { color: grey; } /* line numbers */
279278
pre.code, code { background-color: #eeeeee }
280279
pre.code .comment, code .comment { color: #5C6576 }
281280
pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
301300
span.pre {
302301
white-space: pre }
303302

304-
span.problematic, pre.problematic {
303+
span.problematic {
305304
color: red }
306305

307306
span.section-subtitle {

0 commit comments

Comments
 (0)