Merge branch '14.0' of git+ssh://github.com/shopinvader/pattern-impor…

…t-export into model_domain_on_import_wizard

.copier-answers.yml

@@ -1,9 +1,10 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.0.13
+_commit: v1.1.2
 _src_path: git+https://github.com/shopinvader/shopinvader-addons-repo-template
 black_version: 20.8b1
 generate_requirements_txt: true
 odoo_version: '14.0'
 prettify_xml: true
 python_line_length: 88
+rebel_module_groups: []
 repo_slug: pattern-import-export

.flake8

@@ -8,3 +8,5 @@ select = C,E,F,W,B,B9
 # E501: flake8 line length (covered by bugbear B950)
 # W503: line break before binary operator (black behaviour)
 ignore = E203,E501,W503
+per-file-ignores=
+    __init__.py:F401

.github/workflows/pre-commit.yml

@@ -13,5 +13,8 @@ jobs:
         with:
           # The pylint-odoo version we use here does not support python 3.10
           # https://github.com/OCA/oca-addons-repo-template/issues/80
-          python-version: "3.9"
+          # 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/[email protected]

.github/workflows/pre-commit.yml.rej

@@ -0,0 +1,8 @@
+diff a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml	(rejected hunks)
+@@ -12,2 +12,6 @@ jobs:
+       - uses: actions/setup-python@v2
++        with:
++          # The pylint-odoo version we use here does not support python 3.10
++          # https://github.com/OCA/oca-addons-repo-template/issues/80
++          python-version: "3.9"
+       - uses: pre-commit/[email protected]

.github/workflows/test.yml

@@ -34,12 +34,18 @@ jobs:
       - uses: actions/checkout@v2
         with:
           persist-credentials: false
-      - run: oca_install_addons
-      - run: oca_init_test_database
-      - run: oca_run_tests
+      - 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
+        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
-      - run: |
-          oca_export_and_commit_pot
-          git fetch --unshallow --all
-          git push https://x-access-token:${{ secrets.GIT_PUSH_TOKEN }}@github.com/${{ github.repository }}
-        if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'shopinvader' && startsWith(github.ref, 'refs/heads/14.0') }}
+      - 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 == 'shopinvader' }}

.pre-commit-config.yaml

@@ -111,13 +111,7 @@ repos:
     rev: 3.8.3
     hooks:
       - id: flake8
-        name: flake8 except __init__.py
-        exclude: /__init__\.py$
-        additional_dependencies: ["flake8-bugbear==20.1.4"]
-      - id: flake8
-        name: flake8 only __init__.py
-        args: ["--extend-ignore=F401"] # ignore unused imports in __init__.py
-        files: /__init__\.py$
+        name: flake8
         additional_dependencies: ["flake8-bugbear==20.1.4"]
   - repo: https://github.com/PyCQA/pylint
     rev: pylint-2.5.3