diff --git a/.copier-answers.yml b/.copier-answers.yml index 1bb1f49..c706ffd 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,18 +1,19 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.20 +_commit: v1.29 _src_path: https://github.com/oca/oca-addons-repo-template.git additional_ruff_rules: [] ci: GitHub convert_readme_fragments_to_markdown: false +enable_checklog_odoo: false generate_requirements_txt: true github_check_license: false github_ci_extra_env: {} -github_enable_codecov: true +github_enable_codecov: false github_enable_makepot: false github_enable_stale_action: false -github_enforce_dev_status_compatibility: true +github_enforce_dev_status_compatibility: false include_wkhtmltopdf: false -odoo_test_flavor: Both +odoo_test_flavor: Odoo odoo_version: 14.0 org_name: Akretion org_slug: akretion diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 602ecbc..10b8aca 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -13,13 +13,13 @@ jobs: pre-commit: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 with: python-version: "3.11" - name: Get python version run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV - - uses: actions/cache@v1 + - uses: actions/cache@v4 with: path: ~/.cache/pre-commit key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 395a222..4182f01 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest name: Detect unreleased dependencies steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -41,16 +41,10 @@ jobs: - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest include: "sale_import_delivery_carrier" name: test with Odoo - - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - include: "sale_import_delivery_carrier" - name: test with OCB makepot: "false" - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest exclude: "sale_import_delivery_carrier" name: test with Odoo - - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - exclude: "sale_import_delivery_carrier" - name: test with OCB makepot: "false" services: postgres: @@ -65,7 +59,7 @@ jobs: INCLUDE: "${{ matrix.include }}" EXCLUDE: "${{ matrix.exclude }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Install addons and dependencies @@ -75,11 +69,11 @@ jobs: continue-on-error: true - name: Check development status run: manifestoo -d . check-dev-status --default-dev-status=Beta + continue-on-error: true - name: Initialize test db run: oca_init_test_database - name: Run tests run: oca_run_tests - - 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 == 'akretion' }} diff --git a/.gitignore b/.gitignore index 0090721..6ec07a0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,19 @@ var/ *.egg *.eggs +# Windows installers +*.msi + +# Debian packages +*.deb + +# Redhat packages +*.rpm + +# MacOS packages +*.dmg +*.pkg + # Installer logs pip-log.txt pip-delete-this-directory.txt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 25fc46d..e2f4aa6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: | # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files - .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| + .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|^eslint.config.cjs|^prettier.config.cjs| # Maybe reactivate this when all README files include prettier ignore tags? ^README\.md$| # Library files can have extraneous formatting (even minimized) @@ -16,6 +16,8 @@ exclude: | 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 (LICENSE.*|COPYING.*) default_language_version: @@ -37,11 +39,11 @@ repos: language: fail files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/sbidoul/whool - rev: v0.5 + rev: v1.2 hooks: - id: whool-init - repo: https://github.com/oca/maintainer-tools - rev: 9a170331575a265c092ee6b24b845ec508e8ef75 + rev: d5fab7ee87fceee858a3d01048c78a548974d935 hooks: # update the NOT INSTALLABLE ADDONS section above - id: oca-update-pre-commit-excluded-addons @@ -61,27 +63,39 @@ repos: hooks: - id: oca-checks-odoo-module - id: oca-checks-po - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.2.1 + args: + - --disable=po-pretty-format + - repo: local hooks: - id: prettier name: prettier (with plugin-xml) + entry: prettier + args: + - --write + - --list-different + - --ignore-unknown + types: [text] + files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ + language: node additional_dependencies: - "prettier@2.1.2" - "@prettier/plugin-xml@0.12.0" - args: - - --plugin=@prettier/plugin-xml - files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$ - - repo: https://github.com/pre-commit/mirrors-eslint - rev: v7.14.0 + - repo: local hooks: - id: eslint - verbose: true + name: eslint + entry: eslint args: - --color - --fix + verbose: true + types: [javascript] + language: node + additional_dependencies: + - "eslint@7.8.1" + - "eslint-plugin-jsdoc@" - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v3.3.0 + rev: v3.2.0 hooks: - id: trailing-whitespace # exclude autogenerated files diff --git a/.ruff.toml b/.ruff.toml index d75c6d9..fbf5ccd 100644 --- a/.ruff.toml +++ b/.ruff.toml @@ -8,6 +8,7 @@ extend-select = [ "E501", # line too long (default 88) "I", # isort ] +extend-safe-fixes = ["UP008"] exclude = ["setup/*"] [format]