From 20199fe0ecc187f29021064520092fd5af11c5a7 Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Wed, 30 Mar 2022 21:45:13 +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/base_advanced_reconciliation.py | 6 ++-- .../models/mass_reconcile.py | 2 +- .../tests/test_account_partner_reconcile.py | 2 +- ...t_account_reconcile_reconciliation_date.py | 2 +- .../models/reconciliation_widget.py | 4 +-- 10 files changed, 41 insertions(+), 23 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 6c72d9b8..db7253c3 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: 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: 'TODO: add repo description.' repo_name: account-reconcile repo_slug: account-reconcile +repo_website: https://github.com/OCA/account-reconcile travis_apt_packages: [] travis_apt_sources: [] diff --git a/.eslintrc.yml b/.eslintrc.yml index d4cc423c..9429bc68 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 80ab1a21..a7a13904 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 40614878..9faf4b87 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 16d41e66..fd6c7e9d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/98/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-account-reconcile-98) + +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/account-reconcile&target_branch=14.0) [![Build Status](https://travis-ci.com/OCA/account-reconcile.svg?branch=14.0)](https://travis-ci.com/OCA/account-reconcile) [![codecov](https://codecov.io/gh/OCA/account-reconcile/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/account-reconcile) [![Translation Status](https://translation.odoo-community.org/widgets/account-reconcile-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/account-reconcile-14-0/?utm_source=widget) @@ -37,12 +38,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/account_mass_reconcile/models/base_advanced_reconciliation.py b/account_mass_reconcile/models/base_advanced_reconciliation.py index 57e80321..173d460b 100644 --- a/account_mass_reconcile/models/base_advanced_reconciliation.py +++ b/account_mass_reconcile/models/base_advanced_reconciliation.py @@ -17,7 +17,7 @@ class MassReconcileAdvanced(models.AbstractModel): _description = "Mass Reconcile Advanced" def _query_debit(self): - """Select all move (debit>0) as candidate. """ + """Select all move (debit>0) as candidate.""" select = self._select_query() sql_from = self._from_query() where, params = self._where_query() @@ -28,7 +28,7 @@ class MassReconcileAdvanced(models.AbstractModel): return self.env.cr.dictfetchall() def _query_credit(self): - """Select all move (credit>0) as candidate. """ + """Select all move (credit>0) as candidate.""" select = self._select_query() sql_from = self._from_query() where, params = self._where_query() @@ -220,7 +220,7 @@ class MassReconcileAdvanced(models.AbstractModel): return False def _rec_auto_lines_advanced(self, credit_lines, debit_lines): - """ Advanced reconciliation main loop """ + """Advanced reconciliation main loop""" # pylint: disable=invalid-commit reconciled_ids = [] reconcile_groups = [] diff --git a/account_mass_reconcile/models/mass_reconcile.py b/account_mass_reconcile/models/mass_reconcile.py index 60725441..63e1a044 100644 --- a/account_mass_reconcile/models/mass_reconcile.py +++ b/account_mass_reconcile/models/mass_reconcile.py @@ -254,7 +254,7 @@ class AccountMassReconcile(models.Model): } def open_unreconcile(self): - """ Open the view of move line with the unreconciled move lines""" + """Open the view of move line with the unreconciled move lines""" self.ensure_one() obj_move_line = self.env["account.move.line"] lines = obj_move_line.search( diff --git a/account_partner_reconcile/tests/test_account_partner_reconcile.py b/account_partner_reconcile/tests/test_account_partner_reconcile.py index 7d550e75..e6f3c409 100644 --- a/account_partner_reconcile/tests/test_account_partner_reconcile.py +++ b/account_partner_reconcile/tests/test_account_partner_reconcile.py @@ -5,7 +5,7 @@ from odoo.tests.common import TransactionCase class TestAccountPartnerReconcile(TransactionCase): - """ Tests for Account Partner Reconcile.""" + """Tests for Account Partner Reconcile.""" def setUp(self): super(TestAccountPartnerReconcile, self).setUp() diff --git a/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py b/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py index d4a080ad..3f1e1cc4 100644 --- a/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py +++ b/account_reconcile_reconciliation_date/tests/test_account_reconcile_reconciliation_date.py @@ -107,7 +107,7 @@ class TestAccountReconcileReconciliationDate(AccountTestInvoicingCommon): partner=None, account_id=None, ): - """ Returns an open invoice """ + """Returns an open invoice""" invoice = self.invoice_model.create( { "partner_id": partner or self.partner_agrolait.id, diff --git a/account_reconciliation_widget/models/reconciliation_widget.py b/account_reconciliation_widget/models/reconciliation_widget.py index ec3586f3..11a6b981 100644 --- a/account_reconciliation_widget/models/reconciliation_widget.py +++ b/account_reconciliation_widget/models/reconciliation_widget.py @@ -846,7 +846,7 @@ class AccountReconciliation(models.AbstractModel): def _domain_move_lines_for_manual_reconciliation( self, account_id, partner_id=False, excluded_ids=None, search_str=False ): - """ Create domain criteria that are relevant to manual reconciliation. """ + """Create domain criteria that are relevant to manual reconciliation.""" domain = [ "&", "&", @@ -1072,7 +1072,7 @@ class AccountReconciliation(models.AbstractModel): @api.model def _get_move_line_reconciliation_proposition(self, account_id, partner_id=None): - """ Returns two lines whose amount are opposite """ + """Returns two lines whose amount are opposite""" Account_move_line = self.env["account.move.line"]