Skip to content

Commit 603e45d

Browse files
committed
copier-upd
1 parent f51c19f commit 603e45d

File tree

7 files changed

+45
-36
lines changed

7 files changed

+45
-36
lines changed

.copier-answers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.21.1
2+
_commit: v1.33
33
_src_path: gh:oca/oca-addons-repo-template
44
additional_ruff_rules: []
55
ci: GitHub

.github/workflows/pre-commit.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,18 @@ 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
25-
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
25+
key: "pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}"
26+
restore-keys: |
27+
pre-commit|${{ env.PY }}|
2628
- name: Install pre-commit
2729
run: pip install pre-commit
2830
- name: Run pre-commit

.github/workflows/test.yml

Lines changed: 6 additions & 6 deletions
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
@@ -38,31 +38,31 @@ jobs:
3838
- container: ghcr.io/oca/oca-ci/py3.10-ocb18.0:latest
3939
name: test with OCB
4040
makepot: "false"
41-
env:
42-
PIP_EXTRA_INDEX_URL: "https://wheelhouse.shopinvader.com/simple/"
4341
services:
4442
postgres:
45-
image: postgres:9.6
43+
image: postgres:12.0
4644
env:
4745
POSTGRES_USER: odoo
4846
POSTGRES_PASSWORD: odoo
4947
POSTGRES_DB: odoo
5048
ports:
5149
- 5432:5432
5250
steps:
53-
- uses: actions/checkout@v3
51+
- uses: actions/checkout@v4
5452
with:
5553
persist-credentials: false
5654
- name: Install addons and dependencies
5755
run: oca_install_addons
5856
- name: Check licenses
5957
run: manifestoo -d . check-licenses
58+
continue-on-error: true
6059
- name: Check development status
6160
run: manifestoo -d . check-dev-status --default-dev-status=Beta
61+
continue-on-error: true
6262
- name: Initialize test db
6363
run: oca_init_test_database
6464
- name: Run tests
6565
run: oca_run_tests
6666
- name: Update .pot files
6767
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
68-
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'Akretion' }}
68+
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'akretion' }}

.pre-commit-config.yaml

Lines changed: 31 additions & 22 deletions
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)
@@ -22,7 +22,7 @@ exclude: |
2222
(LICENSE.*|COPYING.*)
2323
default_language_version:
2424
python: python3
25-
node: "14.13.0"
25+
node: "22.9.0"
2626
repos:
2727
- repo: local
2828
hooks:
@@ -39,11 +39,11 @@ 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
46-
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
46+
rev: bf9ecb9938b6a5deca0ff3d870fbd3f33341fded
4747
hooks:
4848
# update the NOT INSTALLABLE ADDONS section above
4949
- id: oca-update-pre-commit-excluded-addons
@@ -57,33 +57,47 @@ repos:
5757
- --repo-name=vertical-bike
5858
- --if-source-changed
5959
- --keep-source-digest
60+
- --convert-fragments-to-markdown
6061
- id: oca-gen-external-dependencies
6162
- repo: https://github.com/OCA/odoo-pre-commit-hooks
62-
rev: v0.0.25
63+
rev: v0.0.33
6364
hooks:
6465
- id: oca-checks-odoo-module
6566
- id: oca-checks-po
66-
- repo: https://github.com/pre-commit/mirrors-prettier
67-
rev: v2.1.2
67+
args:
68+
- --disable=po-pretty-format
69+
- repo: local
6870
hooks:
6971
- id: prettier
7072
name: prettier (with plugin-xml)
71-
additional_dependencies:
72-
- "prettier@2.1.2"
73-
- "@prettier/plugin-xml@0.12.0"
73+
entry: prettier
7474
args:
75-
- --plugin=@prettier/plugin-xml
75+
- --write
76+
- --list-different
77+
- --ignore-unknown
78+
types: [text]
7679
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
77-
- repo: https://github.com/pre-commit/mirrors-eslint
78-
rev: v7.8.1
80+
language: node
81+
additional_dependencies:
82+
- "prettier@3.3.3"
83+
- "@prettier/plugin-xml@3.4.1"
84+
- repo: local
7985
hooks:
8086
- id: eslint
81-
verbose: true
87+
name: eslint
88+
entry: eslint
8289
args:
8390
- --color
8491
- --fix
92+
verbose: true
93+
types: [javascript]
94+
language: node
95+
additional_dependencies:
96+
- "eslint@9.12.0"
97+
- "eslint-plugin-jsdoc@50.3.1"
98+
- "globals@16.0.0"
8599
- repo: https://github.com/pre-commit/pre-commit-hooks
86-
rev: v3.2.0
100+
rev: v4.6.0
87101
hooks:
88102
- id: trailing-whitespace
89103
# exclude autogenerated files
@@ -104,19 +118,14 @@ repos:
104118
- id: check-xml
105119
- id: mixed-line-ending
106120
args: ["--fix=lf"]
107-
- repo: https://github.com/asottile/pyupgrade
108-
rev: v2.7.2
109-
hooks:
110-
- id: pyupgrade
111-
args: ["--keep-percent-format"]
112121
- repo: https://github.com/astral-sh/ruff-pre-commit
113-
rev: v0.1.3
122+
rev: v0.6.8
114123
hooks:
115124
- id: ruff
116125
args: [--fix, --exit-non-zero-on-fix]
117126
- id: ruff-format
118127
- repo: https://github.com/OCA/pylint-odoo
119-
rev: 7.0.2
128+
rev: v9.1.3
120129
hooks:
121130
- id: pylint_odoo
122131
name: pylint with optional checks

.pylintrc-mandatory

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ enable=anomalous-backslash-in-string,
3333
license-allowed,
3434
manifest-author-string,
3535
manifest-deprecated-key,
36-
manifest-required-author,
3736
manifest-required-key,
3837
manifest-version-format,
3938
method-compute,

.ruff.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ extend-select = [
88
"E501", # line too long (default 88)
99
"I", # isort
1010
]
11+
extend-safe-fixes = ["UP008"]
1112
exclude = ["setup/*"]
1213

1314
[format]

test-requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
odoo14-addon-shopinvader
2-
odoo14-addon-shopinvader-delivery-carrier

0 commit comments

Comments
 (0)