From 60f71c5b5124c938b56fd26398abf5340b27e323 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Thu, 31 Mar 2022 18:10:16 +0200 Subject: [PATCH] [IMP] update dotfiles --- .copier-answers.yml | 5 +++- .eslintrc.yml | 2 +- .github/workflows/pre-commit.yml | 29 ++++++++++++++++++------ .pre-commit-config.yaml | 6 ++--- README.md | 5 ++-- web_access_rule_buttons/models/models.py | 2 +- web_company_color/models/assetsbundle.py | 2 +- web_company_color/models/ir_qweb.py | 4 ++-- 8 files changed, 37 insertions(+), 18 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index ebf0e21a9..2a34830f5 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,16 +1,19 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.3.6 +_commit: v1.5.2 _src_path: gh:oca/oca-addons-repo-template ci: Travis dependency_installation_mode: PIP generate_requirements_txt: true include_wkhtmltopdf: false odoo_version: 14.0 +org_name: Odoo Community Association (OCA) +org_slug: OCA rebel_module_groups: [] repo_description: "This project aims to deal with modules related to the webclient\ \ of Odoo. You'll find modules that:\n\n - Add facilities to the UI\n - Add widgets\n\ \ - Ease the import/export features\n - Generally add clientside functionality" repo_name: Web addons for Odoo repo_slug: web +repo_website: https://github.com/OCA/web travis_apt_packages: [] travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423cc..9429bc688 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -4,7 +4,7 @@ env: # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449 parserOptions: - ecmaVersion: 2017 + ecmaVersion: 2019 overrides: - files: diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 80ab1a211..a7a139046 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -2,7 +2,12 @@ name: pre-commit on: pull_request: + branches: + - "14.0*" push: + branches: + - "14.0" + - "14.0-ocabot-*" jobs: pre-commit: @@ -10,11 +15,21 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 + - name: Get python version + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 with: - # The pylint-odoo version we use here does not support python 3.10 - # https://github.com/OCA/oca-addons-repo-template/issues/80 - # We also need to pin to an older version of python for older odoo versions - # where we are not using black > 21. Older black versions won't work with - # Python 3.9.8+, and we can't bump black without reformatting. - python-version: "3.9.7" - - uses: pre-commit/action@v2.0.0 + path: ~/.cache/pre-commit + key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} + - name: Install pre-commit + run: pip install pre-commit + - name: Run pre-commit + run: pre-commit run --all-files --show-diff-on-failure --color=always + - name: Check that all files generated by pre-commit are in git + run: | + newfiles="$(git ls-files --others --exclude-from=.gitignore)" + if [ "$newfiles" != "" ] ; then + echo "Please check-in the following files:" + echo "$newfiles" + exit 1 + fi diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 91be4d15d..5bedc50c4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: - --remove-duplicate-keys - --remove-unused-variables - repo: https://github.com/psf/black - rev: 20.8b1 + rev: 22.3.0 hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier @@ -120,7 +120,7 @@ repos: name: flake8 additional_dependencies: ["flake8-bugbear==20.1.4"] - repo: https://github.com/PyCQA/pylint - rev: pylint-2.5.3 + rev: v2.11.1 hooks: - id: pylint name: pylint with optional checks @@ -129,7 +129,7 @@ repos: - --exit-zero verbose: true additional_dependencies: &pylint_deps - - pylint-odoo==3.5.0 + - pylint-odoo==5.0.5 - id: pylint name: pylint with mandatory checks args: diff --git a/README.md b/README.md index 05cc41a93..ef8046fa9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/162/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-web-162) + +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/web&target_branch=14.0) [![Build Status](https://travis-ci.com/OCA/web.svg?branch=14.0)](https://travis-ci.com/OCA/web) [![codecov](https://codecov.io/gh/OCA/web/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/web) [![Translation Status](https://translation.odoo-community.org/widgets/web-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/web-14-0/?utm_source=widget) @@ -82,7 +83,7 @@ addon | version | maintainers | summary ## Licenses This repository is licensed under [AGPL-3.0](LICENSE). -However, each module can have a totally different license, as long as they adhere to OCA +However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA) policy. Consult each module's `__manifest__.py` file, which contains a `license` key that explains its license. diff --git a/web_access_rule_buttons/models/models.py b/web_access_rule_buttons/models/models.py index 94d4fd85b..ed43cb817 100644 --- a/web_access_rule_buttons/models/models.py +++ b/web_access_rule_buttons/models/models.py @@ -5,7 +5,7 @@ from odoo import exceptions, models class Base(models.AbstractModel): - """ The base model, which is implicitly inherited by all models. """ + """The base model, which is implicitly inherited by all models.""" _inherit = "base" diff --git a/web_company_color/models/assetsbundle.py b/web_company_color/models/assetsbundle.py index d6c31c2be..2f2ce0083 100644 --- a/web_company_color/models/assetsbundle.py +++ b/web_company_color/models/assetsbundle.py @@ -5,7 +5,7 @@ from odoo.addons.base.models.assetsbundle import AssetsBundle, ScssStylesheetAss class AssetsBundleCompanyColor(AssetsBundle): def get_company_color_asset_node(self): - """ Process the user active company scss and returns the node to inject """ + """Process the user active company scss and returns the node to inject""" company_id = self.env["res.company"].browse( self.env.context.get("active_company_id", 0) ) diff --git a/web_company_color/models/ir_qweb.py b/web_company_color/models/ir_qweb.py index 956f9964f..f43c5aace 100644 --- a/web_company_color/models/ir_qweb.py +++ b/web_company_color/models/ir_qweb.py @@ -64,7 +64,7 @@ class QWeb(models.AbstractModel): @api.model def _render(self, id_or_xml_id, values=None, **options): - """ Adds the active company to the context """ + """Adds the active company to the context""" try: active_company_id = int( request.httprequest.cookies.get("cids", "").split(",")[0] @@ -79,7 +79,7 @@ class QWeb(models.AbstractModel): return super()._render(id_or_xml_id, values=values, **options) def _get_asset_content(self, xmlid, options): - """ Handle 'special' web_company_color xmlid """ + """Handle 'special' web_company_color xmlid""" if xmlid == "web_company_color.company_color_assets": asset = AssetsBundleCompanyColor(xmlid, [], env=self.env) return ([], [asset.get_company_color_asset_node()])