diff --git a/.copier-answers.yml b/.copier-answers.yml index 298174f36..9b397bbc0 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,7 +1,7 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.3.6 -_src_path: gh:oca/oca-addons-repo-template -ci: Travis +_commit: v1.5.1 +_src_path: git+https://github.com/OCA/oca-addons-repo-template +ci: GitHub dependency_installation_mode: PIP generate_requirements_txt: true include_wkhtmltopdf: false diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 80ab1a211..06a555e73 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -17,4 +17,21 @@ jobs: # 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 + - name: Get python version + run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV + - uses: actions/cache@v1 + with: + 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/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..1bc7b8b4c --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,68 @@ +name: tests + +on: + pull_request: + branches: + - "14.0*" + push: + branches: + - "14.0*" + +jobs: + unreleased-deps: + runs-on: ubuntu-latest + name: Detect unreleased dependencies + steps: + - uses: actions/checkout@v2 + - run: | + for reqfile in requirements.txt test-requirements.txt ; do + if [ -f ${reqfile} ] ; then + result=0 + # reject non-comment lines that contain a / (i.e. URLs, relative paths) + grep "^[^#].*/" ${reqfile} || result=$? + if [ $result -eq 0 ] ; then + echo "Unreleased dependencies found in ${reqfile}." + exit 1 + fi + fi + done + test: + runs-on: ubuntu-latest + container: ${{ matrix.container }} + name: ${{ matrix.name }} + strategy: + fail-fast: false + matrix: + include: + - container: ghcr.io/oca/oca-ci/py3.6-odoo14.0:latest + makepot: "true" + name: test with Odoo + - container: ghcr.io/oca/oca-ci/py3.6-ocb14.0:latest + name: test with OCB + services: + postgres: + image: postgres:9.6 + env: + POSTGRES_USER: odoo + POSTGRES_PASSWORD: odoo + POSTGRES_DB: odoo + ports: + - 5432:5432 + steps: + - uses: actions/checkout@v2 + with: + persist-credentials: false + - name: Install addons and dependencies + run: oca_install_addons + - name: Check licenses + run: manifestoo -d . check-licenses + - name: Check development status + run: manifestoo -d . check-dev-status --default-dev-status=Beta + - 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 == 'OCA' }} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 50135635d..000000000 --- a/.travis.yml +++ /dev/null @@ -1,46 +0,0 @@ -language: python -cache: - directories: - - $HOME/.cache/pip - - $HOME/.cache/pre-commit - -python: - - "3.6" - -addons: - postgresql: "9.6" - apt: - packages: - - expect-dev # provides unbuffer utility - - libreoffice - - graphviz - - "swig" - -stages: - - test - -jobs: - include: - - stage: test - env: - - TESTS=1 ODOO_REPO="odoo/odoo" MAKEPOT="1" - - stage: test - env: - - TESTS=1 ODOO_REPO="OCA/OCB" -env: - global: - - VERSION="14.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0" - - MQT_DEP=PIP - -install: - - git clone --depth=1 https://github.com/OCA/maintainer-quality-tools.git - ${HOME}/maintainer-quality-tools - - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH} - - export WKHTMLTOPDF_VERSION=0.12.5 - - travis_install_nightly - -script: - - travis_run_tests - -after_success: - - travis_after_tests_success diff --git a/README.md b/README.md index c1794ba87..8b635678e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ -[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/143/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-reporting-engine-143) -[![Build Status](https://travis-ci.com/OCA/reporting-engine.svg?branch=14.0)](https://travis-ci.com/OCA/reporting-engine) +[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/reporting-engine&target_branch=14.0) +[![Pre-commit Status](https://github.com/OCA/reporting-engine/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/OCA/reporting-engine/actions/workflows/pre-commit.yml?query=branch%3A14.0) +[![Build Status](https://github.com/OCA/reporting-engine/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/OCA/reporting-engine/actions/workflows/test.yml?query=branch%3A14.0) [![codecov](https://codecov.io/gh/OCA/reporting-engine/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/reporting-engine) [![Translation Status](https://translation.odoo-community.org/widgets/reporting-engine-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/reporting-engine-14-0/?utm_source=widget) diff --git a/bi_view_editor/__manifest__.py b/bi_view_editor/__manifest__.py index 03a5fb22f..8d3d563c8 100644 --- a/bi_view_editor/__manifest__.py +++ b/bi_view_editor/__manifest__.py @@ -12,6 +12,9 @@ "version": "14.0.1.0.0", "development_status": "Beta", "depends": ["web"], + "external_dependencies": { + "deb": ["graphviz"], + }, "data": [ "security/ir.model.access.csv", "security/rules.xml", diff --git a/report_py3o_fusion_server/__manifest__.py b/report_py3o_fusion_server/__manifest__.py index fd7feb12e..23e9752bb 100644 --- a/report_py3o_fusion_server/__manifest__.py +++ b/report_py3o_fusion_server/__manifest__.py @@ -12,7 +12,10 @@ "Odoo Community Association (OCA)", "website": "https://github.com/OCA/reporting-engine", "depends": ["report_py3o"], - "external_dependencies": {"python": ["py3o.template", "py3o.formats"]}, + "external_dependencies": { + "python": ["py3o.template", "py3o.formats"], + "deb": ["libreoffice"], + }, "demo": ["demo/report_py3o.xml", "demo/py3o_pdf_options.xml"], "data": [ "views/ir_actions_report.xml",