Merge branch 'master' into custom

Conflicts:
	src/.github/workflows/{% if ci == 'GitHub' %}test.yml{% endif %}.jinja
	src/.github/workflows/{% if github_enable_stale_action %}stale.yml{% endif %}

Author: robinkeunen

.github/workflows/test.yml

@@ -7,59 +7,45 @@ on:
   release:
     types: [created]
 
-env:
-  POETRY_VIRTUALENVS_IN_PROJECT: "true"
-
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version:
-          - 3.6
-          - 3.8
-        odoo-version:
-          - 11.0
-          - 12.0
-          - 13.0
-          - 14.0
-          - 15.0
         include:
-          - python-version: 2.7
-            odoo-version: 10.0
-        exclude:
-          - python-version: 3.8
-            odoo-version: 11.0
-          - python-version: 3.8
-            odoo-version: 12.0
+          - odoo-version: 10.0
+            python-version: 2.7
+          - odoo-version: 11.0
+            python-version: 3.6
+          - odoo-version: 12.0
+            python-version: 3.6
+          - odoo-version: 13.0
+            python-version: 3.8
+          - odoo-version: 14.0
+            python-version: 3.8
+          - odoo-version: 15.0
+            python-version: 3.8
+          - odoo-version: 16.0
+            python-version: "3.10"
     steps:
       # Prepare environment
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3
+      - name: Install poetry
+        run: pipx install poetry
+
+      # Install specific alternate python versions required by hooks
       - name: Install python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Python Poetry Action
-        uses: abatilo/actions-poetry@v2.1.0
-      - name: generate cache key PY
-        run:
-          echo "PY=$((python -VV; pip freeze; poetry --version) | sha256sum | cut -d' '
-          -f1)" >> $GITHUB_ENV
-      - uses: actions/cache@v2.1.1
-        with:
-          path: .venv
-          # HACK https://github.com/actions/cache/issues/2#issuecomment-673493515
-          # If you need to "clear" cache, just update the `CACHE_DATE` secret,
-          # putting current date (and time, if needed)
-          key: >-
-            cache ${{ secrets.CACHE_DATE }} ${{ env.PY }} ${{ runner.os }} ${{
-            hashFiles('pyproject.toml') }} ${{ hashFiles('poetry.lock') }}
-      - run: poetry install
+          cache: poetry
+
       # Let tests issue git commits
       - run: git config --global user.name CI
       - run: git config --global user.email CI@GITHUB
 
       # Run all tests
+      - run: poetry install
       - run: poetry run pytest --color yes
         env:
           SELECTED_ODOO_VERSIONS: ${{ matrix.odoo-version }}

.gitignore

@@ -0,0 +1,74 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+/.venv
+/.pytest_cache
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+*.eggs
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Pycharm
+.idea
+
+# Eclipse
+.settings
+
+# Visual Studio cache/options directory
+.vs/
+.vscode
+
+# OSX Files
+.DS_Store
+
+# Django stuff:
+*.log
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Rope
+.ropeproject
+
+# Sphinx documentation
+docs/_build/
+
+# Backup files
+*~
+*.swp
+
+# OCA rules
+!static/lib/

.gitignore

@@ -62,9 +62,13 @@ Go read [our contribution guideline](CONTRIBUTING.md).
 
 This template allows to bootstrap and update addon repositories for these Odoo versions:
 
+- 10.0
+- 11.0
+- 12.0
 - 13.0
 - 14.0
 - 15.0
+- 16.0
 
 Future versions will be added as they are released. Past versions could be added as long
 as they don't break existing branches.

README.md

@@ -20,14 +20,15 @@ _migrations:
 
 odoo_version:
   type: float
-  default: 15.0
+  default: 16.0
   choices:
     - 10.0
     - 11.0
     - 12.0
     - 13.0
     - 14.0
     - 15.0
+    - 16.0
   help: Which Odoo version are we deploying in this branch?
 
 org_slug:
@@ -69,7 +70,7 @@ repo_description:
 
 ci:
   type: str
-  default: Travis
+  default: GitHub
   choices:
     - Travis
     - GitHub
@@ -84,6 +85,7 @@ travis_apt_sources:
     https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json.
 
     Example: [heroku, mono]
+  when: &ci_is_travis "{{ ci == 'Travis' }}"
 
 travis_apt_packages:
   type: yaml
@@ -92,15 +94,16 @@ travis_apt_packages:
     Do you need extra apt packages in Travis? Add them here as a YAML list.
 
     Example: [docker, vim]
+  when: *ci_is_travis
 
 dependency_installation_mode:
-  default: OCA
+  default: PIP
   type: str
   choices:
     - OCA
     - PIP
-  help:
-    Choose how to install module dependencies. Right now, "PIP" mode is experimental.
+  help: Choose how to install module dependencies.
+  when: *ci_is_travis
 
 generate_requirements_txt:
   default: yes
@@ -127,3 +130,32 @@ include_wkhtmltopdf:
   help:
     Do you need to install wkhtmltopdf? Usually only needed if you're going to test PDF
     report generation.
+
+github_enforce_dev_status_compatibility:
+  type: bool
+  default: yes
+  help: GitHub action checks the minimum development status?
+  when: &ci_is_github "{{ ci == 'GitHub' }}"
+
+github_check_license:
+  type: bool
+  default: yes
+  help: GitHub action checks the manifest license?
+  when: *ci_is_github
+
+github_enable_codecov:
+  type: bool
+  default: yes
+  help: GitHub action runs codecov/codecov-action?
+  when: *ci_is_github
+
+github_enable_makepot:
+  type: bool
+  default: yes
+  help: GitHub action updates .pot files?
+  when: *ci_is_github
+
+github_enable_stale_action:
+  type: bool
+  default: yes
+  help: Create GitHub 'stale' action?