diff --git a/.copier-answers.yml b/.copier-answers.yml index a2f80a27831..e035fd36959 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,15 +1,18 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.11.0 +_commit: v1.29 _src_path: https://github.com/OCA/oca-addons-repo-template.git ci: GitHub -dependency_installation_mode: PIP +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_makepot: true github_enable_stale_action: true github_enforce_dev_status_compatibility: true include_wkhtmltopdf: false +odoo_test_flavor: OCB odoo_version: 12.0 org_name: Odoo Community Association (OCA) org_slug: OCA @@ -18,6 +21,4 @@ repo_description: Odoo modules related to Human Resources management repo_name: Human Resources repo_slug: hr repo_website: https://github.com/OCA/hr -travis_apt_packages: [] -travis_apt_sources: [] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 584cf17a2df..7b2892b1805 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@v4 - run: | for reqfile in requirements.txt test-requirements.txt ; do if [ -f ${reqfile} ] ; then @@ -28,18 +28,16 @@ jobs: fi done test: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 container: ${{ matrix.container }} name: ${{ matrix.name }} strategy: fail-fast: false matrix: include: - - container: ghcr.io/oca/oca-ci/py3.6-odoo12.0:latest - makepot: "true" - name: test with Odoo - container: ghcr.io/oca/oca-ci/py3.6-ocb12.0:latest name: test with OCB + makepot: "true" services: postgres: image: postgres:9.6 @@ -50,7 +48,7 @@ jobs: ports: - 5432:5432 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: persist-credentials: false - name: Install addons and dependencies @@ -64,7 +62,9 @@ jobs: run: oca_init_test_database - name: Run tests run: oca_run_tests - - uses: codecov/codecov-action@v1 + - uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} - 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' }} diff --git a/.gitignore b/.gitignore index 645c1e02590..07f14706ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ # Byte-compiled / optimized / DLL files __pycache__/ *.py[cod] +<<<<<<< before updating +======= +/.venv +/.pytest_cache +/.ruff_cache +>>>>>>> after updating # C extensions *.so @@ -21,6 +27,19 @@ var/ .installed.cfg *.egg +# 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/.oca_hooks.cfg b/.oca_hooks.cfg new file mode 100644 index 00000000000..1f3e3e42674 --- /dev/null +++ b/.oca_hooks.cfg @@ -0,0 +1,2 @@ +[MESSAGES_CONTROL] +disable=xml-deprecated-data-node,xml-deprecated-tree-attribute