Skip to content

Commit 39cd769

Browse files
authored
Merge pull request #1 from OCA/16.0
Merge branch OCA/sale-workflow 16.0 into archeti-org / sale-workflow 16.0
2 parents 3132a05 + 066ae74 commit 39cd769

File tree

1,879 files changed

+113981
-2538
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,879 files changed

+113981
-2538
lines changed

.copier-answers.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Do NOT update manually; changes here will be overwritten by Copier
2-
_commit: v1.14.2
2+
_commit: v1.20
33
_src_path: gh:oca/oca-addons-repo-template
44
ci: GitHub
5-
dependency_installation_mode: PIP
5+
convert_readme_fragments_to_markdown: false
66
generate_requirements_txt: true
77
github_check_license: true
88
github_ci_extra_env: {}
@@ -11,14 +11,16 @@ github_enable_makepot: true
1111
github_enable_stale_action: true
1212
github_enforce_dev_status_compatibility: true
1313
include_wkhtmltopdf: false
14+
odoo_test_flavor: Both
1415
odoo_version: 16.0
1516
org_name: Odoo Community Association (OCA)
1617
org_slug: OCA
17-
rebel_module_groups: []
18+
rebel_module_groups:
19+
- sale_packaging_default,sale_order_product_recommendation,sale_order_product_recommendation_packaging_default,sale_order_product_recommendation_elaboration
1820
repo_description: 'TODO: add repo description.'
1921
repo_name: sale-workflow
2022
repo_slug: sale-workflow
2123
repo_website: https://github.com/OCA/sale-workflow
22-
travis_apt_packages: []
23-
travis_apt_sources: []
24+
use_pyproject_toml: false
25+
use_ruff: false
2426

.eslintrc.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ globals:
2525
odoo: readonly
2626
openerp: readonly
2727
owl: readonly
28+
luxon: readonly
2829

2930
# Styling is handled by Prettier, so we only need to enable AST rules;
3031
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890

.github/workflows/pre-commit.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@ jobs:
1313
pre-commit:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717
- uses: actions/setup-python@v2
18+
with:
19+
python-version: "3.11"
1820
- name: Get python version
1921
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
2022
- uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
2527
run: pip install pre-commit
2628
- name: Run pre-commit
2729
run: pre-commit run --all-files --show-diff-on-failure --color=always
30+
env:
31+
# Consider valid a PR that changes README fragments but doesn't
32+
# change the README.rst file itself. It's not really a problem
33+
# because the bot will update it anyway after merge. This way, we
34+
# lower the barrier for functional contributors that want to fix the
35+
# readme fragments, while still letting developers get README
36+
# auto-generated (which also helps functionals when using runboat).
37+
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
38+
SKIP: oca-gen-addon-readme
2839
- name: Check that all files generated by pre-commit are in git
2940
run: |
3041
newfiles="$(git ls-files --others --exclude-from=.gitignore)"

.github/workflows/test.yml

Lines changed: 14 additions & 2 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@v2
17+
- uses: actions/checkout@v3
1818
- run: |
1919
for reqfile in requirements.txt test-requirements.txt ; do
2020
if [ -f ${reqfile} ] ; then
@@ -36,10 +36,19 @@ jobs:
3636
matrix:
3737
include:
3838
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest
39+
include: "sale_packaging_default,sale_order_product_recommendation,sale_order_product_recommendation_packaging_default,sale_order_product_recommendation_elaboration"
40+
name: test with Odoo
41+
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
42+
include: "sale_packaging_default,sale_order_product_recommendation,sale_order_product_recommendation_packaging_default,sale_order_product_recommendation_elaboration"
43+
name: test with OCB
3944
makepot: "true"
45+
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest
46+
exclude: "sale_packaging_default,sale_order_product_recommendation,sale_order_product_recommendation_packaging_default,sale_order_product_recommendation_elaboration"
4047
name: test with Odoo
4148
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
49+
exclude: "sale_packaging_default,sale_order_product_recommendation,sale_order_product_recommendation_packaging_default,sale_order_product_recommendation_elaboration"
4250
name: test with OCB
51+
makepot: "true"
4352
services:
4453
postgres:
4554
image: postgres:12.0
@@ -49,8 +58,11 @@ jobs:
4958
POSTGRES_DB: odoo
5059
ports:
5160
- 5432:5432
61+
env:
62+
INCLUDE: "${{ matrix.include }}"
63+
EXCLUDE: "${{ matrix.exclude }}"
5264
steps:
53-
- uses: actions/checkout@v2
65+
- uses: actions/checkout@v3
5466
with:
5567
persist-credentials: false
5668
- name: Install addons and dependencies

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ __pycache__/
33
*.py[cod]
44
/.venv
55
/.pytest_cache
6+
/.ruff_cache
67

78
# C extensions
89
*.so

.pre-commit-config.yaml

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
exclude: |
22
(?x)
33
# NOT INSTALLABLE ADDONS
4+
^sale_invoice_policy/|
45
# END NOT INSTALLABLE ADDONS
56
# Files and folders generated by bots, to avoid loops
67
^setup/|/static/description/index\.html$|
@@ -12,6 +13,10 @@ exclude: |
1213
/static/(src/)?lib/|
1314
# Repos using Sphinx to generate docs don't need prettying
1415
^docs/_templates/.*\.html$|
16+
# Don't bother non-technical authors with formatting issues in docs
17+
readme/.*\.(rst|md)$|
18+
# Ignore build and dist directories in addons
19+
/build/|/dist/|
1520
# You don't usually want a bot to modify your legal texts
1621
(LICENSE.*|COPYING.*)
1722
default_language_version:
@@ -33,12 +38,25 @@ repos:
3338
language: fail
3439
files: '[a-zA-Z0-9_]*/i18n/en\.po$'
3540
- repo: https://github.com/oca/maintainer-tools
36-
rev: 4cd2b852214dead80822e93e6749b16f2785b2fe
41+
rev: 9a170331575a265c092ee6b24b845ec508e8ef75
3742
hooks:
3843
# update the NOT INSTALLABLE ADDONS section above
3944
- id: oca-update-pre-commit-excluded-addons
4045
- id: oca-fix-manifest-website
4146
args: ["https://github.com/OCA/sale-workflow"]
47+
- id: oca-gen-addon-readme
48+
args:
49+
- --addons-dir=.
50+
- --branch=16.0
51+
- --org-name=OCA
52+
- --repo-name=sale-workflow
53+
- --if-source-changed
54+
- --keep-source-digest
55+
- repo: https://github.com/OCA/odoo-pre-commit-hooks
56+
rev: v0.0.25
57+
hooks:
58+
- id: oca-checks-odoo-module
59+
- id: oca-checks-po
4260
- repo: https://github.com/myint/autoflake
4361
rev: v1.6.1
4462
hooks:
@@ -125,7 +143,7 @@ repos:
125143
name: flake8
126144
additional_dependencies: ["flake8-bugbear==21.9.2"]
127145
- repo: https://github.com/OCA/pylint-odoo
128-
rev: 7.0.2
146+
rev: v8.0.19
129147
hooks:
130148
- id: pylint_odoo
131149
name: pylint with optional checks

.pylintrc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ load-plugins=pylint_odoo
55
score=n
66

77
[ODOOLINT]
8-
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
9-
manifest_required_authors=Odoo Community Association (OCA)
10-
manifest_required_keys=license
11-
manifest_deprecated_keys=description,active
12-
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
13-
valid_odoo_versions=16.0
8+
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
9+
manifest-required-authors=Odoo Community Association (OCA)
10+
manifest-required-keys=license
11+
manifest-deprecated-keys=description,active
12+
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
13+
valid-odoo-versions=16.0
1414

1515
[MESSAGES CONTROL]
1616
disable=all

.pylintrc-mandatory

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ load-plugins=pylint_odoo
44
score=n
55

66
[ODOOLINT]
7-
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
8-
manifest_required_authors=Odoo Community Association (OCA)
9-
manifest_required_keys=license
10-
manifest_deprecated_keys=description,active
11-
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
12-
valid_odoo_versions=16.0
7+
readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
8+
manifest-required-authors=Odoo Community Association (OCA)
9+
manifest-required-keys=license
10+
manifest-deprecated-keys=description,active
11+
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
12+
valid-odoo-versions=16.0
1313

1414
[MESSAGES CONTROL]
1515
disable=all

0 commit comments

Comments
 (0)