Merge pull request #204 from GlodoUK/T9098

fix: pylint-odoo v8 configuration options ignored

Author: pedrobaeza

src/.pylintrc-mandatory.jinja

@@ -6,12 +6,21 @@ load-plugins=pylint_odoo
 score=n
 
 [ODOOLINT]
+{%- if odoo_version < 16 %}
 readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
 manifest_required_authors={{ org_name }}
 manifest_required_keys=license
 manifest_deprecated_keys=description,active
 license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
 valid_odoo_versions={{ odoo_version }}
+{%- else %}
+readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
+manifest-required-authors={{ org_name }}
+manifest-required-keys=license
+manifest-deprecated-keys=description,active
+license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
+valid-odoo-versions={{ odoo_version }}
+{%- endif %}
 
 [MESSAGES CONTROL]
 disable=all

tests/test_copy.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 
+import packaging.version
 import yaml
 from copier.main import run_auto
 
@@ -12,6 +13,16 @@
 REPO_ID = 149
 
 
+def read_and_parse_precommit_rev(tmp_path: Path, repo: str):
+    # Attempt to find the rev of a pre-commit repo.
+    # If it found, return the actual version, if it's not return 0.0.0.
+    config = yaml.safe_load((tmp_path / ".pre-commit-config.yaml").read_text())
+    entry = next(
+        filter(lambda r: r.get("repo", "") == repo, config.get("repos", [])), {}
+    )
+    return packaging.version.parse(entry.get("rev", "0.0.0"))
+
+
 def test_bootstrap(tmp_path: Path, odoo_version: float, cloned_template: Path):
     """Test that a project is properly bootstrapped."""
     data = {
@@ -31,12 +42,20 @@ def test_bootstrap(tmp_path: Path, odoo_version: float, cloned_template: Path):
     pylintrc_mandatory = (tmp_path / ".pylintrc-mandatory").read_text()
     assert "disable=all\n" in pylintrc_mandatory
     assert "enable=" in pylintrc_mandatory
-    assert f"valid_odoo_versions={odoo_version}" in pylintrc_mandatory
+    pylint_odoo_version = read_and_parse_precommit_rev(
+        tmp_path, "https://github.com/OCA/pylint-odoo"
+    )
+    valid_odoo_versions = "valid_odoo_versions"
+    if pylint_odoo_version >= packaging.version.parse("v8.0.5"):
+        # versions of pylint-odoo >= 8.0.5 use dashes for keys, rather than
+        # underscores
+        valid_odoo_versions = "valid-odoo-versions"
+    assert f"{valid_odoo_versions}={odoo_version}" in pylintrc_mandatory
     assert SOME_PYLINT_OPTIONAL_CHECK not in pylintrc_mandatory
     pylintrc_optional = (tmp_path / ".pylintrc").read_text()
     assert "disable=all\n" in pylintrc_optional
     assert "# This .pylintrc contains" in pylintrc_optional
-    assert f"valid_odoo_versions={odoo_version}" in pylintrc_optional
+    assert f"{valid_odoo_versions}={odoo_version}" in pylintrc_optional
     assert SOME_PYLINT_OPTIONAL_CHECK in pylintrc_optional
     flake8 = (tmp_path / ".flake8").read_text()
     assert "[flake8]" in flake8