Merge branch '14.0' of github.com:OCA/intrastat-extrastat into 14.0

2025-02-16 17:13:41 +02:00 · 2022-04-10 15:29:33 +02:00
parent 704666472b 23031e9cd8
commit 6a7deff93b
12 changed files with 115 additions and 69 deletions
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,14 +1,17 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.3.6
+_commit: v1.5.2
 _src_path: gh:oca/oca-addons-repo-template
-ci: Travis
+ci: GitHub
 dependency_installation_mode: PIP
 generate_requirements_txt: true
 include_wkhtmltopdf: false
 odoo_version: 14.0
+org_name: Odoo Community Association (OCA)
+org_slug: OCA
 rebel_module_groups: []
 repo_description: 'TODO: add repo description.'
 repo_name: intrastat-extrastat
 repo_slug: intrastat-extrastat
+repo_website: https://github.com/OCA/intrastat-extrastat
 travis_apt_packages: []
 travis_apt_sources: []
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -4,7 +4,7 @@ env:

 # See https://github.com/OCA/odoo-community.org/issues/37#issuecomment-470686449
 parserOptions:
-  ecmaVersion: 2017
+  ecmaVersion: 2019

 overrides:
  - files:
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -2,7 +2,12 @@ name: pre-commit

 on:
  pull_request:
+    branches:
+      - "14.0*"
  push:
+    branches:
+      - "14.0"
+      - "14.0-ocabot-*"

 jobs:
  pre-commit:
@@ -10,11 +15,21 @@ jobs:
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-python@v2
+      - name: Get python version
+        run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
+      - uses: actions/cache@v1
        with:
-          # The pylint-odoo version we use here does not support python 3.10
-          # https://github.com/OCA/oca-addons-repo-template/issues/80
-          # We also need to pin to an older version of python for older odoo versions
-          # 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
+          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
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -0,0 +1,69 @@
+name: tests
+
+on:
+  pull_request:
+    branches:
+      - "14.0*"
+  push:
+    branches:
+      - "14.0"
+      - "14.0-ocabot-*"
+
+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' }}
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -46,7 +46,7 @@ repos:
          - --remove-duplicate-keys
          - --remove-unused-variables
  - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 22.3.0
    hooks:
      - id: black
  - repo: https://github.com/pre-commit/mirrors-prettier
@@ -120,7 +120,7 @@ repos:
        name: flake8
        additional_dependencies: ["flake8-bugbear==20.1.4"]
  - repo: https://github.com/PyCQA/pylint
-    rev: pylint-2.5.3
+    rev: v2.11.1
    hooks:
      - id: pylint
        name: pylint with optional checks
@@ -129,7 +129,7 @@ repos:
          - --exit-zero
        verbose: true
        additional_dependencies: &pylint_deps
-          - pylint-odoo==3.5.0
+          - pylint-odoo==5.0.5
      - id: pylint
        name: pylint with mandatory checks
        args:
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,42 +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
-
-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}
-  - travis_install_nightly
-
-script:
-  - travis_run_tests
-
-after_success:
-  - travis_after_tests_success
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
-[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat/227/14.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-intrastat-extrastat-227)
-[![Build Status](https://travis-ci.com/OCA/intrastat-extrastat.svg?branch=14.0)](https://travis-ci.com/OCA/intrastat-extrastat)
+
+[![Runboat](https://img.shields.io/badge/runboat-Try%20me-875A7B.png)](https://runboat.odoo-community.org/builds?repo=OCA/intrastat-extrastat&target_branch=14.0)
+[![Pre-commit Status](https://github.com/OCA/intrastat-extrastat/actions/workflows/pre-commit.yml/badge.svg?branch=14.0)](https://github.com/OCA/intrastat-extrastat/actions/workflows/pre-commit.yml?query=branch%3A14.0)
+[![Build Status](https://github.com/OCA/intrastat-extrastat/actions/workflows/test.yml/badge.svg?branch=14.0)](https://github.com/OCA/intrastat-extrastat/actions/workflows/test.yml?query=branch%3A14.0)
 [![codecov](https://codecov.io/gh/OCA/intrastat-extrastat/branch/14.0/graph/badge.svg)](https://codecov.io/gh/OCA/intrastat-extrastat)
 [![Translation Status](https://translation.odoo-community.org/widgets/intrastat-extrastat-14-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/intrastat-extrastat-14-0/?utm_source=widget)

@@ -34,12 +36,11 @@ addon | version | maintainers | summary

 This repository is licensed under [AGPL-3.0](LICENSE).

-However, each module can have a totally different license, as long as they adhere to OCA
+However, each module can have a totally different license, as long as they adhere to Odoo Community Association (OCA)
 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.
--- a/intrastat_product/models/intrastat_product_declaration.py
+++ b/intrastat_product/models/intrastat_product_declaration.py
@@ -199,7 +199,7 @@ class IntrastatProductDeclaration(models.Model):

    @api.depends("month")
    def _compute_check_validity(self):
-        """ TO DO: logic based upon computation lines """
+        """TO DO: logic based upon computation lines"""
        for this in self:
            this.valid = True

@@ -526,7 +526,7 @@ class IntrastatProductDeclaration(models.Model):
        return vat

    def _update_computation_line_vals(self, inv_line, line_vals, notedict):
-        """ placeholder for localization modules """
+        """placeholder for localization modules"""

    def _handle_invoice_accessory_cost(
        self,
@@ -602,7 +602,7 @@ class IntrastatProductDeclaration(models.Model):
            return False

    def _gather_invoices_init(self, notedict):
-        """ placeholder for localization modules """
+        """placeholder for localization modules"""

    def _format_line_note(self, line, notedict, line_notes):
        indent = 8 * " "
@@ -884,7 +884,7 @@ class IntrastatProductDeclaration(models.Model):
        return vals

    def generate_declaration(self):
-        """ generate declaration lines """
+        """generate declaration lines"""
        self.ensure_one()
        assert self.valid, "Computation lines are not valid"
        self.message_post(body=_("Generate Declaration Lines"))
@@ -915,7 +915,7 @@ class IntrastatProductDeclaration(models.Model):
            )

    def generate_xml(self):
-        """ generate the INTRASTAT Declaration XML file """
+        """generate the INTRASTAT Declaration XML file"""
        self.ensure_one()
        if self.xml_attachment_id:
            raise UserError(
@@ -1099,7 +1099,7 @@ class IntrastatProductComputationLine(models.Model):

    @api.depends("transport_id")
    def _compute_check_validity(self):
-        """ TO DO: logic based upon fields """
+        """TO DO: logic based upon fields"""
        for this in self:
            this.valid = True

--- a/intrastat_product/tests/test_company.py
+++ b/intrastat_product/tests/test_company.py
@@ -37,4 +37,4 @@ class TestIntrastatCompany(IntrastatProductCommon):


 class TestIntrastatProductCase(TestIntrastatCompany, SavepointCase):
-    """ Test Intrastat Product """
+    """Test Intrastat Product"""
--- a/intrastat_product/tests/test_intrastat_product.py
+++ b/intrastat_product/tests/test_intrastat_product.py
@@ -64,4 +64,4 @@ class TestIntrastatProduct(IntrastatProductCommon):


 class TestIntrastatProductCase(TestIntrastatProduct, SavepointCase):
-    """ Test Intrastat Product """
+    """Test Intrastat Product"""
--- a/intrastat_product/tests/test_purchase_order.py
+++ b/intrastat_product/tests/test_purchase_order.py
@@ -50,4 +50,4 @@ class TestIntrastatProductPurchase(IntrastatPurchaseCommon):


 class TestIntrastatProductPurchaseCase(TestIntrastatProductPurchase, SavepointCase):
-    """ Test Intrastat Purchase """
+    """Test Intrastat Purchase"""
--- a/intrastat_product/tests/test_sale_order.py
+++ b/intrastat_product/tests/test_sale_order.py
@@ -85,4 +85,4 @@ class TestIntrastatProductSale(IntrastatSaleCommon):


 class TestIntrastatProductSaleCase(TestIntrastatProductSale, SavepointCase):
-    """ Test Intrastat Sale """
+    """Test Intrastat Sale"""