From a273b96f5a3b3397cda5d44949bbc35c57b94fc5 Mon Sep 17 00:00:00 2001 From: Saran440 Date: Wed, 29 Nov 2023 18:02:27 +0700 Subject: [PATCH] [UPD] pre-commit --- .copier-answers.yml | 23 ++++++++++++---------- .eslintrc.yml | 1 + .github/workflows/pre-commit.yml | 13 +++++++++++- .github/workflows/test.yml | 8 ++++---- .gitignore | 1 + .pre-commit-config.yaml | 23 +++++++++++++++++++--- .pylintrc | 12 +++++------ .pylintrc-mandatory | 12 +++++------ README.md | 18 +++++++++++++---- setup/.setuptools-odoo-make-default-ignore | 2 ++ setup/README | 2 ++ 11 files changed, 81 insertions(+), 34 deletions(-) create mode 100644 setup/.setuptools-odoo-make-default-ignore create mode 100644 setup/README diff --git a/.copier-answers.yml b/.copier-answers.yml index 6bcc868c..cbec973f 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,8 +1,8 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.14.2 +_commit: v1.19.2 _src_path: gh:oca/oca-addons-repo-template ci: GitHub -dependency_installation_mode: PIP +convert_readme_fragments_to_markdown: false generate_requirements_txt: true github_check_license: true github_ci_extra_env: {} @@ -11,14 +11,17 @@ github_enable_makepot: true github_enable_stale_action: true github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false +odoo_test_flavor: Both odoo_version: 16.0 -org_name: Odoo Community Association (OCA) -org_slug: OCA +org_name: Ecosoft +org_slug: ecosoft-odoo rebel_module_groups: [] -repo_description: 'TODO: add repo description.' -repo_name: account-budgeting -repo_slug: account-budgeting -repo_website: https://github.com/OCA/account-budgeting -travis_apt_packages: [] -travis_apt_sources: [] +repo_description: This project is the main project from a set of budget control modules. + to fullfill additional needs. Having said that, following will describe the full + cycle of budget control already provided by this project +repo_name: Budgeting +repo_slug: budgeting +repo_website: https://github.com/ecosoft-odoo/budgeting +use_pyproject_toml: false +use_ruff: false diff --git a/.eslintrc.yml b/.eslintrc.yml index 9429bc68..fed88d70 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -22,6 +22,7 @@ globals: odoo: readonly openerp: readonly owl: readonly + luxon: readonly # 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 diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 23e6e58d..38b0ba11 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,8 +13,10 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v2 + with: + python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - uses: actions/cache@v1 @@ -25,6 +27,15 @@ jobs: run: pip install pre-commit - name: Run pre-commit 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 run: | newfiles="$(git ls-files --others --exclude-from=.gitignore)" diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f1b2b9fd..64c5efe6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest name: Detect unreleased dependencies steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -36,10 +36,10 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.10-odoo16.0:latest - makepot: "true" name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.10-ocb16.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:12.0 @@ -50,7 +50,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: persist-credentials: false - name: Install addons and dependencies @@ -66,4 +66,4 @@ jobs: - uses: codecov/codecov-action@v1 - name: Update .pot files 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 == 'OCA' }} + if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'ecosoft-odoo' }} diff --git a/.gitignore b/.gitignore index 9c283fd4..0090721f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ __pycache__/ *.py[cod] /.venv /.pytest_cache +/.ruff_cache # C extensions *.so diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f6a91381..1a8a2c66 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -12,6 +12,10 @@ exclude: | /static/(src/)?lib/| # Repos using Sphinx to generate docs don't need prettying ^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/| # You don't usually want a bot to modify your legal texts (LICENSE.*|COPYING.*) default_language_version: @@ -33,12 +37,25 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools - rev: 4cd2b852214dead80822e93e6749b16f2785b2fe + rev: f71041f22b8cd68cf7c77b73a14ca8d8cd190a60 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons - id: oca-fix-manifest-website - args: ["https://github.com/OCA/account-budgeting"] + args: ["https://github.com/ecosoft-odoo/budgeting"] + - id: oca-gen-addon-readme + args: + - --addons-dir=. + - --branch=16.0 + - --org-name=ecosoft-odoo + - --repo-name=budgeting + - --if-source-changed + - --keep-source-digest + - repo: https://github.com/OCA/odoo-pre-commit-hooks + rev: v0.0.25 + hooks: + - id: oca-checks-odoo-module + - id: oca-checks-po - repo: https://github.com/myint/autoflake rev: v1.6.1 hooks: @@ -125,7 +142,7 @@ repos: name: flake8 additional_dependencies: ["flake8-bugbear==21.9.2"] - repo: https://github.com/OCA/pylint-odoo - rev: 7.0.2 + rev: v8.0.19 hooks: - id: pylint_odoo name: pylint with optional checks diff --git a/.pylintrc b/.pylintrc index cad9c2f1..cd83895d 100644 --- a/.pylintrc +++ b/.pylintrc @@ -5,12 +5,12 @@ load-plugins=pylint_odoo score=n [ODOOLINT] -readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" -manifest_required_authors=Odoo Community Association (OCA) -manifest_required_keys=license -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 -valid_odoo_versions=16.0 +readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest-required-authors=Ecosoft +manifest-required-keys=license +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 +valid-odoo-versions=16.0 [MESSAGES CONTROL] disable=all diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory index fa4b81c4..f3b82958 100644 --- a/.pylintrc-mandatory +++ b/.pylintrc-mandatory @@ -4,12 +4,12 @@ load-plugins=pylint_odoo score=n [ODOOLINT] -readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" -manifest_required_authors=Odoo Community Association (OCA) -manifest_required_keys=license -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 -valid_odoo_versions=16.0 +readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst" +manifest-required-authors=Ecosoft +manifest-required-keys=license +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 +valid-odoo-versions=16.0 [MESSAGES CONTROL] disable=all diff --git a/README.md b/README.md index eb85ad24..267a84bb 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,27 @@ +<<<<<<< before updating [![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/account-analytic&target_branch=15.0) [![Pre-commit Status](https://github.com/OCA/account-analytic/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)](https://github.com/OCA/account-analytic/actions/workflows/pre-commit.yml?query=branch%3A15.0) [![Build Status](https://github.com/OCA/account-analytic/actions/workflows/test.yml/badge.svg?branch=15.0)](https://github.com/OCA/account-analytic/actions/workflows/test.yml?query=branch%3A15.0) [![codecov](https://codecov.io/gh/OCA/account-analytic/branch/15.0/graph/badge.svg)](https://codecov.io/gh/OCA/account-analytic) [![Translation Status](https://translation.odoo-community.org/widgets/account-analytic-15-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/account-analytic-15-0/?utm_source=widget) +======= + +[![Pre-commit Status](https://github.com/ecosoft-odoo/budgeting/actions/workflows/pre-commit.yml/badge.svg?branch=16.0)](https://github.com/ecosoft-odoo/budgeting/actions/workflows/pre-commit.yml?query=branch%3A16.0) +[![Build Status](https://github.com/ecosoft-odoo/budgeting/actions/workflows/test.yml/badge.svg?branch=16.0)](https://github.com/ecosoft-odoo/budgeting/actions/workflows/test.yml?query=branch%3A16.0) +[![codecov](https://codecov.io/gh/ecosoft-odoo/budgeting/branch/16.0/graph/badge.svg)](https://codecov.io/gh/ecosoft-odoo/budgeting) + +>>>>>>> after updating # Budgeting +<<<<<<< before updating This repository will be a module for extending the main budgeting. +======= +This project is the main project from a set of budget control modules. to fullfill additional needs. Having said that, following will describe the full cycle of budget control already provided by this project +>>>>>>> after updating @@ -21,11 +33,9 @@ This repository will be a module for extending the main budgeting. This repository is licensed under [AGPL-3.0](LICENSE). -However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA) +However, each module can have a totally different license, as long as they adhere to Ecosoft 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/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore new file mode 100644 index 00000000..207e6153 --- /dev/null +++ b/setup/.setuptools-odoo-make-default-ignore @@ -0,0 +1,2 @@ +# addons listed in this file are ignored by +# setuptools-odoo-make-default (one addon per line) diff --git a/setup/README b/setup/README new file mode 100644 index 00000000..a63d633e --- /dev/null +++ b/setup/README @@ -0,0 +1,2 @@ +To learn more about this directory, please visit +https://pypi.python.org/pypi/setuptools-odoo