Skip to content

Commit 42ceb4c

Browse files
Merge PR #193 into 12.0
Signed-off-by legalsylvain
2 parents c2c3048 + c375d0c commit 42ceb4c

File tree

5 files changed

+48
-15
lines changed

5 files changed

+48
-15
lines changed

.copier-answers.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: a7bd24b
3-
_src_path: https://github.com/grap/oca-addons-repo-template-new.git
2+
_commit: ebd3bb9
3+
_src_path: https://github.com/grap/oca-addons-repo-template-new
44
ci: GitHub
5+
convert_readme_fragments_to_markdown: false
6+
enable_checklog_odoo: false
57
generate_requirements_txt: true
68
github_check_license: true
79
github_ci_extra_env: {}
@@ -22,4 +24,6 @@ repo_name: Incubator of Odoo (formely OpenERP) modules before they are shared to
2224
OCA
2325
repo_slug: grap-odoo-incubator
2426
repo_website: https://github.com/grap/grap-odoo-incubator
27+
use_pyproject_toml: false
28+
use_ruff: false
2529

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 3 deletions
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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
ports:
3232
- 5432:5432
3333
steps:
34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@v4
3535
with:
3636
persist-credentials: false
3737
- name: Install addons and dependencies
@@ -45,4 +45,9 @@ jobs:
4545
run: oca_init_test_database
4646
- name: Run tests
4747
run: oca_run_tests
48-
- uses: codecov/codecov-action@v1
48+
- uses: codecov/codecov-action@v4
49+
with:
50+
token: ${{ secrets.CODECOV_TOKEN }}
51+
- name: Update .pot files
52+
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
53+
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'grap' }}

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ __pycache__/
88
*.py[cod]
99
/.venv
1010
/.pytest_cache
11+
/.ruff_cache
1112

1213
# C extensions
1314
*.so
@@ -29,6 +30,19 @@ var/
2930
*.egg
3031
*.eggs
3132

33+
# Windows installers
34+
*.msi
35+
36+
# Debian packages
37+
*.deb
38+
39+
# Redhat packages
40+
*.rpm
41+
42+
# MacOS packages
43+
*.dmg
44+
*.pkg
45+
3246
# Installer logs
3347
pip-log.txt
3448
pip-delete-this-directory.txt

.pre-commit-config.yaml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
exclude: |
32
(?x)
43
# NOT INSTALLABLE ADDONS
@@ -8,7 +7,7 @@ exclude: |
87
# Files and folders generated by bots, to avoid loops
98
^setup/|/static/description/index\.html$|
109
# We don't want to mess with tool-generated files
11-
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
10+
.svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs|
1211
# Maybe reactivate this when all README files include prettier ignore tags?
1312
^README\.md$|
1413
# Library files can have extraneous formatting (even minimized)
@@ -19,6 +18,8 @@ exclude: |
1918
readme/.*\.(rst|md)$|
2019
# Ignore build and dist directories in addons
2120
/build/|/dist/|
21+
# Ignore test files in addons
22+
/tests/samples/.*|
2223
# You don't usually want a bot to modify your legal texts
2324
(LICENSE.*|COPYING.*)
2425
default_language_version:
@@ -40,7 +41,7 @@ repos:
4041
language: fail
4142
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
4243
- repo: https://github.com/oca/maintainer-tools
43-
rev: 969238e47c07d0c40573acff81d170f63245d738
44+
rev: d5fab7ee87fceee858a3d01048c78a548974d935
4445
hooks:
4546
# update the NOT INSTALLABLE ADDONS section above
4647
- id: oca-update-pre-commit-excluded-addons
@@ -51,8 +52,10 @@ repos:
5152
hooks:
5253
- id: oca-checks-odoo-module
5354
- id: oca-checks-po
55+
args:
56+
- --disable=po-pretty-format
5457
- repo: https://github.com/myint/autoflake
55-
rev: v1.4
58+
rev: v1.5.3
5659
hooks:
5760
- id: autoflake
5861
args:
@@ -66,14 +69,21 @@ repos:
6669
rev: 22.3.0
6770
hooks:
6871
- id: black
69-
- repo: https://github.com/pre-commit/mirrors-eslint
70-
rev: v7.8.1
72+
- repo: local
7173
hooks:
7274
- id: eslint
73-
verbose: true
75+
name: eslint
76+
entry: eslint
7477
args:
7578
- --color
7679
- --fix
80+
verbose: true
81+
types: [javascript]
82+
language: node
83+
additional_dependencies:
84+
85+
- "eslint-plugin-jsdoc@"
86+
- "globals@"
7787
- repo: https://github.com/pre-commit/pre-commit-hooks
7888
rev: v3.2.0
7989
hooks:
@@ -120,7 +130,7 @@ repos:
120130
- --header
121131
- "# generated from manifests external_dependencies"
122132
- repo: https://github.com/PyCQA/flake8
123-
rev: 3.8.3
133+
rev: 5.0.0
124134
hooks:
125135
- id: flake8
126136
name: flake8

0 commit comments

Comments
 (0)