Merge PR #176 into 14.0

Signed-off-by thomaspaulb
OCA · Dec 19, 2023 · bbcd058 · bbcd058
2 parents 40ee8c3 + a7fe3ed
commit bbcd058
Show file tree

Hide file tree

Showing 14 changed files with 86 additions and 78 deletions.
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,8 +1,9 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.2
+_commit: v1.20
 _src_path: gh:oca/oca-addons-repo-template
+additional_ruff_rules: []
 ci: GitHub
-dependency_installation_mode: PIP
+convert_readme_fragments_to_markdown: false
 generate_requirements_txt: true
 github_check_license: true
 github_ci_extra_env: {}
@@ -11,15 +12,15 @@ github_enable_makepot: true
 github_enable_stale_action: true
 github_enforce_dev_status_compatibility: true
 include_wkhtmltopdf: false
+odoo_test_flavor: Both
 odoo_version: 14.0
 org_name: Odoo Community Association (OCA)
 org_slug: OCA
 rebel_module_groups: []
-repo_description: null
+repo_description: Tools to manage environment-dependent configuration
 repo_name: server-env
 repo_slug: server-env
 repo_website: https://github.com/OCA/server-env
-travis_apt_packages:
-- xmlsec1
-travis_apt_sources: []
+use_pyproject_toml: false
+use_ruff: true
 
diff --git a/.eslintrc.yml b/.eslintrc.yml
@@ -22,6 +22,7 @@ globals:
   odoo: readonly
   openerp: readonly
   owl: readonly
+  luxon: readonly
 
 # Styling is handled by Prettier, so we only need to enable AST rules;
 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890

diff --git a/.flake8 b/.flake8
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -13,8 +13,10 @@ jobs:
   pre-commit:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v2
+        with:
+          python-version: "3.11"
       - name: Get python version
         run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
       - uses: actions/cache@v1
@@ -25,6 +27,15 @@ jobs:
         run: pip install pre-commit
       - name: Run pre-commit
         run: pre-commit run --all-files --show-diff-on-failure --color=always
+        env:
+          # Consider valid a PR that changes README fragments but doesn't
+          # change the README.rst file itself. It's not really a problem
+          # because the bot will update it anyway after merge. This way, we
+          # lower the barrier for functional contributors that want to fix the
+          # readme fragments, while still letting developers get README
+          # auto-generated (which also helps functionals when using runboat).
+          # DOCS https://pre-commit.com/#temporarily-disabling-hooks
+          SKIP: oca-gen-addon-readme
       - name: Check that all files generated by pre-commit are in git
         run: |
           newfiles="$(git ls-files --others --exclude-from=.gitignore)"

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Detect unreleased dependencies
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: |
           for reqfile in requirements.txt test-requirements.txt ; do
               if [ -f ${reqfile} ] ; then
@@ -36,10 +36,10 @@ jobs:
       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
+            makepot: "true"
     services:
       postgres:
         image: postgres:9.6
@@ -50,7 +50,7 @@ jobs:
         ports:
           - 5432:5432
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Install addons and dependencies

diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 *.py[cod]
 /.venv
 /.pytest_cache
+/.ruff_cache
 
 # C extensions
 *.so

diff --git a/.isort.cfg b/.isort.cfg
diff --git a/.oca_hooks.cfg b/.oca_hooks.cfg
@@ -0,0 +1,2 @@
+[MESSAGES_CONTROL]
+disable=xml-deprecated-data-node,xml-deprecated-tree-attribute
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,6 +14,10 @@ exclude: |
   /tests/fixtures/|
   # Repos using Sphinx to generate docs don't need prettying
   ^docs/_templates/.*\.html$|
+  # Don't bother non-technical authors with formatting issues in docs
+  readme/.*\.(rst|md)$|
+  # Ignore build and dist directories in addons
+  /build/|/dist/|
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
@@ -35,27 +39,25 @@ repos:
         language: fail
         files: '[a-zA-Z0-9_]*/i18n/en\.po$'
   - repo: https://github.com/oca/maintainer-tools
-    rev: ab1d7f6
+    rev: 9a170331575a265c092ee6b24b845ec508e8ef75
     hooks:
       # update the NOT INSTALLABLE ADDONS section above
       - id: oca-update-pre-commit-excluded-addons
       - id: oca-fix-manifest-website
         args: ["https://github.com/OCA/server-env"]
-  - repo: https://github.com/myint/autoflake
-    rev: v1.4
-    hooks:
-      - id: autoflake
+      - id: oca-gen-addon-readme
         args:
-          - --expand-star-imports
-          - --ignore-init-module-imports
-          - --in-place
-          - --remove-all-unused-imports
-          - --remove-duplicate-keys
-          - --remove-unused-variables
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
+          - --addons-dir=.
+          - --branch=14.0
+          - --org-name=OCA
+          - --repo-name=server-env
+          - --if-source-changed
+          - --keep-source-digest
+  - repo: https://github.com/OCA/odoo-pre-commit-hooks
+    rev: v0.0.25
     hooks:
-      - id: black
+      - id: oca-checks-odoo-module
+      - id: oca-checks-po
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.1.2
     hooks:
@@ -102,14 +104,6 @@ repos:
     hooks:
       - id: pyupgrade
         args: ["--keep-percent-format"]
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort except __init__.py
-        args:
-          - --settings=.
-        exclude: /__init__\.py$
   - repo: https://github.com/acsone/setuptools-odoo
     rev: 3.1.8
     hooks:
@@ -120,12 +114,12 @@ repos:
           - requirements.txt
           - --header
           - "# generated from manifests external_dependencies"
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.8.3
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.3
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies: ["flake8-bugbear==20.1.4"]
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
   - repo: https://github.com/OCA/pylint-odoo
     rev: 7.0.2
     hooks:

diff --git a/.ruff.toml b/.ruff.toml
@@ -0,0 +1,28 @@
+
+fix = true
+
+[lint]
+extend-select = [
+    "B",
+    "C90",
+    "E501",  # line too long (default 88)
+    "I",  # isort
+]
+exclude = ["setup/*"]
+
+[format]
+exclude = ["setup/*"]
+
+[per-file-ignores]
+"__init__.py" = ["F401", "I001"]  # ignore unused and unsorted imports in __init__.py
+"__manifest__.py" = ["B018"]  # useless expression
+
+[isort]
+section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
+
+[isort.sections]
+"odoo" = ["odoo"]
+"odoo-addons" = ["odoo.addons"]
+
+[mccabe]
+max-complexity = 16
diff --git a/data_encryption/models/encrypted_data.py b/data_encryption/models/encrypted_data.py
@@ -44,14 +44,14 @@ def _decrypt_data(self, env):
         cipher = self._get_cipher(env)
         try:
             return cipher.decrypt(self.encrypted_data).decode()
-        except InvalidToken:
+        except InvalidToken as err:
             raise ValidationError(
                 _(
                     "Password has been encrypted with a different "
                     "key. Unless you can recover the previous key, "
                     "this password is unreadable."
                 )
-            )
+            ) from err
 
     @api.model
     @ormcache("self._uid", "name", "env")
@@ -77,10 +77,10 @@ def _encrypted_read_json(self, name, env=None):
             return {}
         try:
             return json.loads(data)
-        except (ValueError, TypeError):
+        except (ValueError, TypeError) as err:
             raise ValidationError(
                 _("The data you are trying to read are not in a json format")
-            )
+            ) from err
 
     @staticmethod
     def _retrieve_env():

diff --git a/server_environment/server_env.py b/server_environment/server_env.py
@@ -118,7 +118,9 @@ def _load_config_from_server_env_files(config_p):
     try:
         config_p.read(conf_files)
     except Exception as e:
-        raise Exception('Cannot read config files "{}":  {}'.format(conf_files, e))
+        raise Exception(
+            'Cannot read config files "{}":  {}'.format(conf_files, e)
+        ) from e
 
 
 def _load_config_from_rcfile(config_p):
@@ -135,7 +137,7 @@ def _load_config_from_env(config_p):
             except configparser.Error as err:
                 raise Exception(
                     "{} content could not be parsed: {}".format(varname, err)
-                )
+                ) from err
 
 
 def _load_config():

diff --git a/server_environment_data_encryption/models/server_env_mixin.py b/server_environment_data_encryption/models/server_env_mixin.py
@@ -105,9 +105,7 @@ def _get_extra_environment_info_div(self, current_env, extra_envs):
                       <strong>{}</strong>
                     </div>
                   </div>
-            """.format(
-                    "alert-danger", warning_string
-                )
+            """.format("alert-danger", warning_string)
             )
             return elem
 
@@ -120,9 +118,7 @@ def _get_extra_environment_info_div(self, current_env, extra_envs):
                     type="object" string="{}{}"
                     class="btn btn-lg btn-primary ml-2"
                     context="{}"/>
-            """.format(
-                button_string, environment, {"environment": environment}
-            )
+            """.format(button_string, environment, {"environment": environment})
             button_div += "{}".format(button)
         button_div += "</div>"
         alert_string = _("Modify values for {} environment").format(current_env)
@@ -137,9 +133,7 @@ def _get_extra_environment_info_div(self, current_env, extra_envs):
                 </div>
                 {}
               </div>
-        """.format(
-                alert_type, alert_string, button_div
-            )
+        """.format(alert_type, alert_string, button_div)
         )
         return elem
 

diff --git a/server_environment_ir_config_parameter/models/ir_config_parameter.py b/server_environment_ir_config_parameter/models/ir_config_parameter.py
@@ -10,7 +10,6 @@
 
 
 class IrConfigParameter(models.Model):
-
     _inherit = "ir.config_parameter"
 
     is_environment = fields.Boolean(