sync project

This commit is contained in:
Alexandre Fayolle
2024-06-24 10:55:29 +02:00
parent 0a70537139
commit 451facfeb6
12 changed files with 117 additions and 104 deletions
+11 -9
View File
@@ -1,25 +1,27 @@
# Do NOT update manually; changes here will be overwritten by Copier # Do NOT update manually; changes here will be overwritten by Copier
_commit: v1.14.2 _commit: v1.22
_src_path: https://github.com/OCA/oca-addons-repo-template.git _src_path: https://github.com/OCA/oca-addons-repo-template.git
additional_ruff_rules: []
ci: GitHub ci: GitHub
dependency_installation_mode: PIP convert_readme_fragments_to_markdown: true
generate_requirements_txt: false generate_requirements_txt: true
github_check_license: true github_check_license: false
github_ci_extra_env: {} github_ci_extra_env: {}
github_enable_codecov: true github_enable_codecov: false
github_enable_makepot: false github_enable_makepot: false
github_enable_stale_action: true github_enable_stale_action: true
github_enforce_dev_status_compatibility: false github_enforce_dev_status_compatibility: false
include_wkhtmltopdf: false include_wkhtmltopdf: false
odoo_version: 16.0 odoo_test_flavor: Both
odoo_version: 17.0
org_name: Camptocamp org_name: Camptocamp
org_slug: camptocamp org_slug: camptocamp
rebel_module_groups: rebel_module_groups:
- attachment_azure,cloud_platform_azure - attachment_azure,cloud_platform_azure
repo_description: '' repo_description: 'Tools to run Odoo on a cloud platform. Mainly Azure at the moment. '
repo_name: Odoo Cloud Addons repo_name: Odoo Cloud Addons
repo_slug: odoo-cloud-platform repo_slug: odoo-cloud-platform
repo_website: https://github.com/camptocamp/odoo-cloud-platform repo_website: https://github.com/camptocamp/odoo-cloud-platform
travis_apt_packages: [] use_pyproject_toml: true
travis_apt_sources: [] use_ruff: true
+2 -1
View File
@@ -4,7 +4,7 @@ env:
# See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
parserOptions: parserOptions:
ecmaVersion: 2019 ecmaVersion: 2022
overrides: overrides:
- files: - files:
@@ -22,6 +22,7 @@ globals:
odoo: readonly odoo: readonly
openerp: readonly openerp: readonly
owl: readonly owl: readonly
luxon: readonly
# Styling is handled by Prettier, so we only need to enable AST rules; # Styling is handled by Prettier, so we only need to enable AST rules;
# see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
-12
View File
@@ -1,12 +0,0 @@
[flake8]
max-line-length = 88
max-complexity = 16
# B = bugbear
# B9 = bugbear opinionated (incl line length)
select = C,E,F,W,B,B9
# E203: whitespace before ':' (black behaviour)
# E501: flake8 line length (covered by bugbear B950)
# W503: line break before binary operator (black behaviour)
ignore = E203,E501,W503
per-file-ignores=
__init__.py:F401
+14 -3
View File
@@ -3,11 +3,11 @@ name: pre-commit
on: on:
pull_request: pull_request:
branches: branches:
- "16.0*" - "17.0*"
push: push:
branches: branches:
- "16.0" - "17.0"
- "16.0-ocabot-*" - "17.0-ocabot-*"
jobs: jobs:
pre-commit: pre-commit:
@@ -15,6 +15,8 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-python@v2 - uses: actions/setup-python@v2
with:
python-version: "3.11"
- name: Get python version - name: Get python version
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
- uses: actions/cache@v1 - uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
run: pip install pre-commit run: pip install pre-commit
- name: Run pre-commit - name: Run pre-commit
run: pre-commit run --all-files --show-diff-on-failure --color=always run: pre-commit run --all-files --show-diff-on-failure --color=always
env:
# Consider valid a PR that changes README fragments but doesn't
# change the README.rst file itself. It's not really a problem
# because the bot will update it anyway after merge. This way, we
# lower the barrier for functional contributors that want to fix the
# readme fragments, while still letting developers get README
# auto-generated (which also helps functionals when using runboat).
# DOCS https://pre-commit.com/#temporarily-disabling-hooks
SKIP: oca-gen-addon-readme
- name: Check that all files generated by pre-commit are in git - name: Check that all files generated by pre-commit are in git
run: | run: |
newfiles="$(git ls-files --others --exclude-from=.gitignore)" newfiles="$(git ls-files --others --exclude-from=.gitignore)"
+2 -2
View File
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Stale PRs and issues policy - name: Stale PRs and issues policy
uses: actions/stale@v4 uses: actions/stale@v9
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
# General settings. # General settings.
@@ -48,7 +48,7 @@ jobs:
# * Issues that are pending more information # * Issues that are pending more information
# * Except Issues marked as "no stale" # * Except Issues marked as "no stale"
- name: Needs more information stale issues policy - name: Needs more information stale issues policy
uses: actions/stale@v4 uses: actions/stale@v9
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
ascending: true ascending: true
+15 -15
View File
@@ -3,11 +3,11 @@ name: tests
on: on:
pull_request: pull_request:
branches: branches:
- "16.0*" - "17.0*"
push: push:
branches: branches:
- "16.0" - "17.0"
- "16.0-ocabot-*" - "17.0-ocabot-*"
jobs: jobs:
unreleased-deps: unreleased-deps:
@@ -35,20 +35,20 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest - container: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest
include: "attachment_azure,cloud_platform_azure" include: "attachment_azure,cloud_platform_azure"
makepot: "false" name: test with Odoo
name: test azure with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
include: "attachment_azure,cloud_platform_azure" include: "attachment_azure,cloud_platform_azure"
name: test azure with OCA name: test with OCB
- container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest makepot: "false"
exclude: "attachment_s3,cloud_platform_exoscale,attachment_swift,cloud_platform_ovh,attachment_azure,cloud_platform_azure" - container: ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest
exclude: "attachment_azure,cloud_platform_azure"
name: test with Odoo
- container: ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest
exclude: "attachment_azure,cloud_platform_azure"
name: test with OCB
makepot: "false" makepot: "false"
name: test others with Odoo
- container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest
exclude: "attachment_s3,cloud_platform_exoscale,attachment_swift,cloud_platform_ovh,attachment_azure,cloud_platform_azure"
name: test others with OCB
services: services:
postgres: postgres:
image: postgres:12.0 image: postgres:12.0
@@ -69,6 +69,7 @@ jobs:
run: oca_install_addons run: oca_install_addons
- name: Check licenses - name: Check licenses
run: manifestoo -d . check-licenses run: manifestoo -d . check-licenses
continue-on-error: true
- name: Check development status - name: Check development status
run: manifestoo -d . check-dev-status --default-dev-status=Beta run: manifestoo -d . check-dev-status --default-dev-status=Beta
continue-on-error: true continue-on-error: true
@@ -76,7 +77,6 @@ jobs:
run: oca_init_test_database run: oca_init_test_database
- name: Run tests - name: Run tests
run: oca_run_tests run: oca_run_tests
- uses: codecov/codecov-action@v1
- name: Update .pot files - name: Update .pot files
run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }} run: oca_export_and_push_pot https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'camptocamp' }} if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'camptocamp' }}
+1
View File
@@ -3,6 +3,7 @@ __pycache__/
*.py[cod] *.py[cod]
/.venv /.venv
/.pytest_cache /.pytest_cache
/.ruff_cache
# C extensions # C extensions
*.so *.so
-13
View File
@@ -1,13 +0,0 @@
[settings]
; see https://github.com/psf/black
multi_line_output=3
include_trailing_comma=True
force_grid_wrap=0
combine_as_imports=True
use_parentheses=True
line_length=88
known_odoo=odoo
known_odoo_addons=odoo.addons
sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
default_section=THIRDPARTY
ensure_newline_before_comments = True
+30 -37
View File
@@ -20,6 +20,12 @@ exclude: |
/static/(src/)?lib/| /static/(src/)?lib/|
# Repos using Sphinx to generate docs don't need prettying # Repos using Sphinx to generate docs don't need prettying
^docs/_templates/.*\.html$| ^docs/_templates/.*\.html$|
# Don't bother non-technical authors with formatting issues in docs
readme/.*\.(rst|md)$|
# Ignore build and dist directories in addons
/build/|/dist/|
# Ignore test files in addons
/tests/samples/.*|
# You don't usually want a bot to modify your legal texts # You don't usually want a bot to modify your legal texts
(LICENSE.*|COPYING.*) (LICENSE.*|COPYING.*)
default_language_version: default_language_version:
@@ -40,28 +46,32 @@ repos:
entry: found a en.po file entry: found a en.po file
language: fail language: fail
files: '[a-zA-Z0-9_]*/i18n/en\.po$' files: '[a-zA-Z0-9_]*/i18n/en\.po$'
- repo: https://github.com/sbidoul/whool
rev: v0.5
hooks:
- id: whool-init
- repo: https://github.com/oca/maintainer-tools - repo: https://github.com/oca/maintainer-tools
rev: 4cd2b852214dead80822e93e6749b16f2785b2fe rev: 9a170331575a265c092ee6b24b845ec508e8ef75
hooks: hooks:
# update the NOT INSTALLABLE ADDONS section above # update the NOT INSTALLABLE ADDONS section above
- id: oca-update-pre-commit-excluded-addons - id: oca-update-pre-commit-excluded-addons
- id: oca-fix-manifest-website - id: oca-fix-manifest-website
args: ["https://github.com/camptocamp/odoo-cloud-platform"] args: ["https://github.com/camptocamp/odoo-cloud-platform"]
- repo: https://github.com/myint/autoflake - id: oca-gen-addon-readme
rev: v1.6.1
hooks:
- id: autoflake
args: args:
- --expand-star-imports - --addons-dir=.
- --ignore-init-module-imports - --branch=17.0
- --in-place - --org-name=camptocamp
- --remove-all-unused-imports - --repo-name=odoo-cloud-platform
- --remove-duplicate-keys - --if-source-changed
- --remove-unused-variables - --keep-source-digest
- repo: https://github.com/psf/black - --convert-fragments-to-markdown
rev: 22.8.0 - id: oca-gen-external-dependencies
- repo: https://github.com/OCA/odoo-pre-commit-hooks
rev: v0.0.25
hooks: hooks:
- id: black - id: oca-checks-odoo-module
- id: oca-checks-po
- repo: https://github.com/pre-commit/mirrors-prettier - repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1 rev: v2.7.1
hooks: hooks:
@@ -103,31 +113,14 @@ repos:
- id: check-xml - id: check-xml
- id: mixed-line-ending - id: mixed-line-ending
args: ["--fix=lf"] args: ["--fix=lf"]
- repo: https://github.com/asottile/pyupgrade - repo: https://github.com/astral-sh/ruff-pre-commit
rev: v2.38.2 rev: v0.1.3
hooks: hooks:
- id: pyupgrade - id: ruff
args: ["--keep-percent-format"] args: [--fix, --exit-non-zero-on-fix]
- repo: https://github.com/PyCQA/isort - id: ruff-format
rev: 5.12.0
hooks:
- id: isort
name: isort except __init__.py
args:
- --settings=.
exclude: /__init__\.py$
- repo: https://github.com/acsone/setuptools-odoo
rev: 3.1.8
hooks:
- id: setuptools-odoo-make-default
- repo: https://github.com/PyCQA/flake8
rev: 3.9.2
hooks:
- id: flake8
name: flake8
additional_dependencies: ["flake8-bugbear==21.9.2"]
- repo: https://github.com/OCA/pylint-odoo - repo: https://github.com/OCA/pylint-odoo
rev: 7.0.2 rev: v9.0.4
hooks: hooks:
- id: pylint_odoo - id: pylint_odoo
name: pylint with optional checks name: pylint with optional checks
+6 -6
View File
@@ -5,12 +5,12 @@ load-plugins=pylint_odoo
score=n score=n
[ODOOLINT] [ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Camptocamp manifest-required-authors=Camptocamp
manifest_required_keys=license manifest-required-keys=license
manifest_deprecated_keys=description,active manifest-deprecated-keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0 valid-odoo-versions=17.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
+6 -6
View File
@@ -4,12 +4,12 @@ load-plugins=pylint_odoo
score=n score=n
[ODOOLINT] [ODOOLINT]
readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
manifest_required_authors=Camptocamp manifest-required-authors=Camptocamp
manifest_required_keys=license manifest-required-keys=license
manifest_deprecated_keys=description,active manifest-deprecated-keys=description,active
license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3 license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid_odoo_versions=16.0 valid-odoo-versions=17.0
[MESSAGES CONTROL] [MESSAGES CONTROL]
disable=all disable=all
+30
View File
@@ -0,0 +1,30 @@
target-version = "py310"
fix = true
[lint]
extend-select = [
"B",
"C90",
"E501", # line too long (default 88)
"I", # isort
"UP", # pyupgrade
]
exclude = ["setup/*"]
[format]
exclude = ["setup/*"]
[per-file-ignores]
"__init__.py" = ["F401", "I001"] # ignore unused and unsorted imports in __init__.py
"__manifest__.py" = ["B018"] # useless expression
[isort]
section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
[isort.sections]
"odoo" = ["odoo"]
"odoo-addons" = ["odoo.addons"]
[mccabe]
max-complexity = 16