diff --git a/.copier-answers.yml b/.copier-answers.yml index 6e6fe0cfb..c3a1b9df7 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,15 +1,17 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v2.1.4 +_commit: v2.1.10 _src_path: https://github.com/coopiteasy/oca-addons-repo-template.git ci: GitHub dependency_installation_mode: OCA generate_requirements_txt: true github_check_license: true +github_ci_extra_env: {} github_enable_codecov: true github_enable_makepot: true github_enable_stale_action: true github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false +odoo_test_flavor: OCB odoo_version: 14.0 org_name: Coop IT Easy SC org_slug: coopiteasy diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index a7a139046..755f8a225 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -11,7 +11,7 @@ on: jobs: pre-commit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6b71c1f63..f00ebcc39 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ on: jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 container: ${{ matrix.container }} name: ${{ matrix.name }} strategy: @@ -19,8 +19,8 @@ jobs: matrix: include: - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest - makepot: "true" name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 0a8278953..16ccf573e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -27,6 +27,11 @@ repos: entry: found forbidden files; remove them language: fail files: "\\.rej$" + - id: en-po-files + name: en.po files cannot exist + entry: found a en.po file + language: fail + files: '[a-zA-Z0-9_]*/i18n/en\.po$' - repo: https://github.com/oca/maintainer-tools rev: ab1d7f6 hooks: @@ -50,13 +55,13 @@ repos: hooks: - id: black - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.4.1 + rev: v2.1.2 hooks: - id: prettier name: prettier (with plugin-xml) additional_dependencies: - - "prettier@2.4.1" - - "@prettier/plugin-xml@1.1.0" + - "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)$ @@ -96,7 +101,7 @@ repos: - id: pyupgrade args: ["--keep-percent-format"] - repo: https://github.com/PyCQA/isort - rev: 5.5.1 + rev: 5.12.0 hooks: - id: isort name: isort except __init__.py diff --git a/test-requirements.txt b/test-requirements.txt deleted file mode 100644 index 2f5925c41..000000000 --- a/test-requirements.txt +++ /dev/null @@ -1 +0,0 @@ -git+https://github.com/coopiteasy/addons@14.0#subdirectory=setup/partner_contact_address