[13.0] Update Copier

2025-01-21 12:57:49 +02:00 · 2023-02-01 13:34:06 +01:00
parent 52a33a7648
commit b55c36a063
11 changed files with 74 additions and 73 deletions
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,14 +1,24 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.3.5
+_commit: v1.14.1
 _src_path: https://github.com/OCA/oca-addons-repo-template.git
 ci: GitHub
 dependency_installation_mode: OCA
 generate_requirements_txt: false
+github_check_license: true
+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: true
 odoo_version: 13.0
+org_name: ForgeFlow
+org_slug: ForgeFlow
 rebel_module_groups: []
 repo_description: Manage returns authorizations
 repo_name: stock-rma
 repo_slug: https://github.com/ForgeFlow/stock-rma
+repo_website: https://github.com/ForgeFlow/stock-rma
 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
@@ -10,12 +10,27 @@ on:

 jobs:
  pre-commit:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
    steps:
      - uses: actions/checkout@v2
      - 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/action@v2.0.0
+          python-version: "3.8"
+      - 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
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: test Odoo addons
+name: tests

 on:
  pull_request:
@@ -9,16 +9,36 @@ on:
      - "13.0"

 jobs:
-  test:
+  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-20.04
    container: ${{ matrix.container }}
+    name: ${{ matrix.name }}
    strategy:
      fail-fast: false
      matrix:
        include:
          - container: ghcr.io/oca/oca-ci/py3.6-odoo13.0:latest
            makepot: "true"
+            name: test with Odoo
          - container: ghcr.io/oca/oca-ci/py3.6-ocb13.0:latest
+            name: test with OCB
    services:
      postgres:
        image: postgres:9.6
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ build/
 develop-eggs/
 dist/
 eggs/
-lib/
 lib64/
 parts/
 sdist/
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,7 +5,7 @@ exclude: |
  # Files and folders generated by bots, to avoid loops
  ^setup/|/static/description/index\.html$|
  # We don't want to mess with tool-generated files
-  .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|
+  .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/|
  # Maybe reactivate this when all README files include prettier ignore tags?
  ^README\.md$|
  # Library files can have extraneous formatting (even minimized)
@@ -27,6 +27,11 @@ repos:
        entry: found forbidden files; remove them
        language: fail
        files: "\\.rej$"
+      - id: en-po-files
+        name: en.po files cannot exist
+        entry: found a en.po file
+        language: fail
+        files: '[a-zA-Z0-9_]*/i18n/en\.po$'
  - repo: https://github.com/oca/maintainer-tools
    rev: ab1d7f6
    hooks:
@@ -49,6 +54,7 @@ repos:
    rev: 22.3.0
    hooks:
      - id: black
+        additional_dependencies: ["click<8.1.0"]
  - repo: https://github.com/pre-commit/mirrors-prettier
    rev: v1.19.1
    hooks:
@@ -101,10 +107,10 @@ repos:
        name: isort except __init__.py
        exclude: /__init__\.py$
  - repo: https://github.com/acsone/setuptools-odoo
-    rev: 2.5.2
+    rev: 3.1.8
    hooks:
      - id: setuptools-odoo-make-default
-  - repo: https://gitlab.com/pycqa/flake8
+  - repo: https://github.com/PyCQA/flake8
    rev: 3.7.9
    hooks:
      - id: flake8
--- a/.pylintrc
+++ b/.pylintrc
@@ -1,3 +1,5 @@
+
+
 [MASTER]
 load-plugins=pylint_odoo
 score=n
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -1,3 +1,4 @@
+
 [MASTER]
 load-plugins=pylint_odoo
 score=n
--- a/.t2d.yml
+++ b/.t2d.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="13.0" TESTS="0" LINT_CHECK="0" MAKEPOT="0"
-    - WKHTMLTOPDF_VERSION="0.12.5"
-
-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/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,10 +0,0 @@
-# OCA Guidelines
-
-Please follow the official guide from the
-[OCA Guidelines page](https://odoo-community.org/page/contributing).
-
-## Project Specific Guidelines
-
-<!-- /!\ do not modify above this line -->
-
-This project does not have specific coding guidelines.
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
-[![Runbot Status](https://runbot.odoo-community.org/runbot/badge/flat//13.0.svg)](https://runbot.odoo-community.org/runbot/repo/github-com-oca-https://github.com/ForgeFlow/stock-rma-)
-[![Build Status](https://travis-ci.com/OCA/https://github.com/ForgeFlow/stock-rma.svg?branch=13.0)](https://travis-ci.com/OCA/https://github.com/ForgeFlow/stock-rma)
-[![codecov](https://codecov.io/gh/OCA/https://github.com/ForgeFlow/stock-rma/branch/13.0/graph/badge.svg)](https://codecov.io/gh/OCA/https://github.com/ForgeFlow/stock-rma)
-[![Translation Status](https://translation.odoo-community.org/widgets/https://github.com/ForgeFlow/stock-rma-13-0/-/svg-badge.svg)](https://translation.odoo-community.org/engage/https://github.com/ForgeFlow/stock-rma-13-0/?utm_source=widget)
+
+
+<!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
+[![Pre-commit Status](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/pre-commit.yml/badge.svg?branch=13.0)](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/pre-commit.yml?query=branch%3A13.0)
+[![Build Status](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/test.yml/badge.svg?branch=13.0)](https://github.com/ForgeFlow/https://github.com/ForgeFlow/stock-rma/actions/workflows/test.yml?query=branch%3A13.0)
+[![codecov](https://codecov.io/gh/ForgeFlow/https://github.com/ForgeFlow/stock-rma/branch/13.0/graph/badge.svg)](https://codecov.io/gh/ForgeFlow/https://github.com/ForgeFlow/stock-rma)
+<!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->

 <!-- /!\ do not modify above this line -->

@@ -25,12 +28,9 @@ This part will be replaced when running the oca-gen-addons-table script from OCA

 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 ForgeFlow
 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.