Skip to content

Commit 815176a

Browse files
authored
Merge pull request #747 from OCA/14.0-ocabot-update-dotfiles
[14.0] dotfiles update needs manual intervention
2 parents b53f851 + ed757f6 commit 815176a

File tree

5 files changed

+44
-18
lines changed

5 files changed

+44
-18
lines changed

.copier-answers.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.22
2+
_commit: v1.29
33
_src_path: gh:oca/oca-addons-repo-template
44
ci: GitHub
55
convert_readme_fragments_to_markdown: false
6+
enable_checklog_odoo: false
67
generate_requirements_txt: true
78
github_check_license: true
89
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
@@ -50,7 +50,7 @@ jobs:
5050
ports:
5151
- 5432:5432
5252
steps:
53-
- uses: actions/checkout@v3
53+
- uses: actions/checkout@v4
5454
with:
5555
persist-credentials: false
5656
- name: Install addons and dependencies

.gitignore

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

28+
# Windows installers
29+
*.msi
30+
31+
# Debian packages
32+
*.deb
33+
34+
# Redhat packages
35+
*.rpm
36+
37+
# MacOS packages
38+
*.dmg
39+
*.pkg
40+
2841
# Installer logs
2942
pip-log.txt
3043
pip-delete-this-directory.txt

.pre-commit-config.yaml

+24-12
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/oca/maintainer-tools
42-
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
42+
rev: d5fab7ee87fceee858a3d01048c78a548974d935
4343
hooks:
4444
# update the NOT INSTALLABLE ADDONS section above
4545
- id: oca-update-pre-commit-excluded-addons
@@ -58,8 +58,10 @@ repos:
5858
hooks:
5959
- id: oca-checks-odoo-module
6060
- id: oca-checks-po
61+
args:
62+
- --disable=po-pretty-format
6163
- repo: https://github.com/myint/autoflake
62-
rev: v1.4
64+
rev: v1.5.3
6365
hooks:
6466
- id: autoflake
6567
args:
@@ -73,27 +75,37 @@ repos:
7375
rev: 22.3.0
7476
hooks:
7577
- id: black
76-
- repo: https://github.com/pre-commit/mirrors-prettier
77-
rev: v2.1.2
78+
- repo: local
7879
hooks:
7980
- id: prettier
8081
name: prettier (with plugin-xml)
82+
entry: prettier
83+
args:
84+
- --write
85+
- --list-different
86+
- --ignore-unknown
87+
types: [text]
88+
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
89+
language: node
8190
additional_dependencies:
8291
- "prettier@2.1.2"
8392
- "@prettier/plugin-xml@0.12.0"
84-
args:
85-
- --plugin=@prettier/plugin-xml
86-
files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
8793
# For ebill_paynet don't format the message template files
8894
exclude: /messages/.*\.xml$|/components/wsdl/.*\.xml$|/tests/examples/.*\.xml$
89-
- repo: https://github.com/pre-commit/mirrors-eslint
90-
rev: v7.8.1
95+
- repo: local
9196
hooks:
9297
- id: eslint
93-
verbose: true
98+
name: eslint
99+
entry: eslint
94100
args:
95101
- --color
96102
- --fix
103+
verbose: true
104+
types: [javascript]
105+
language: node
106+
additional_dependencies:
107+
- "eslint@7.8.1"
108+
- "eslint-plugin-jsdoc@"
97109
- repo: https://github.com/pre-commit/pre-commit-hooks
98110
rev: v3.2.0
99111
hooks:
@@ -140,7 +152,7 @@ repos:
140152
- --header
141153
- "# generated from manifests external_dependencies"
142154
- repo: https://github.com/PyCQA/flake8
143-
rev: 3.8.3
155+
rev: 5.0.0
144156
hooks:
145157
- id: flake8
146158
name: flake8

0 commit comments

Comments
 (0)