From c6082cacf400f3352c2d1a324d1a71b1d6340ae0 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Thu, 31 Mar 2022 17:10:49 +0200 Subject: [PATCH] [IMP] update dotfiles [ci skip] --- .copier-answers.yml | 5 +++- .eslintrc.yml | 2 +- .github/workflows/pre-commit.yml | 29 ++++++++++++++----- .pre-commit-config.yaml | 6 ++-- README.md | 6 ++-- .../models/sale_order.py | 2 +- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index a8368d165b..0df6f9685e 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,14 +1,17 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.3.6 +_commit: v1.5.2 _src_path: https://github.com/OCA/oca-addons-repo-template.git ci: Travis dependency_installation_mode: OCA 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: Advanced Product Configurator (based on the Pledra project) repo_name: Product Configurator repo_slug: product-configurator +repo_website: https://github.com/OCA/product-configurator travis_apt_packages: [] travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423ccd..9429bc688a 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 80ab1a2117..a7a1390461 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 d8581af9cb..f8b537d9c5 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 37b6107180..509220b18b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat//14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-product-configurator-) + +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/product-configurator&target_branch=14.0) [![Build Status](https://travis-ci.com/OCA/product-configurator.svg?branch=14.0)](https://travis-ci.com/OCA/product-configurator) [![codecov](https://codecov.io/gh/OCA/product-configurator/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/product-configurator) [![Translation Status](https://translation.odoo-community.org/widgets/product-configurator-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/product-configurator-14-0/?utm_source=widget) @@ -42,12 +43,11 @@ addon | version | maintainers | summary 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. ---- - OCA, or the [Odoo Community Association](http://odoo-community.org/), is a nonprofit organization whose mission is to support the collaborative development of Odoo features and promote its widespread use. diff --git a/website_product_configurator/models/sale_order.py b/website_product_configurator/models/sale_order.py index 26b89c81f7..7808d86bd1 100644 --- a/website_product_configurator/models/sale_order.py +++ b/website_product_configurator/models/sale_order.py @@ -14,7 +14,7 @@ class SaleOrder(models.Model): def _cart_update( self, product_id=None, line_id=None, add_qty=0, set_qty=0, **kwargs ): - """ Add or set product quantity, add_qty can be negative """ + """Add or set product quantity, add_qty can be negative""" self.ensure_one() product_context = dict(self.env.context) product_context.setdefault("lang", self.sudo().partner_id.lang)