Add option to set file extensions for pylint and prettier. Add xml check per default. Bump version

Author: fkantelberg

src/doblib/__init__.py

@@ -1 +1 @@
-VERSION = "0.19.2"
+VERSION = "0.19.3"

src/doblib/ci.py

@@ -107,17 +107,22 @@ def _ci_isort(self, options, args, paths, ignores):
         return utils.call(*cmd, *args, *paths, pipe=False)
 
     def _ci_prettier(self, options, args, paths, ignores):
-        """ """
+        """Run prettier on supported files"""
         executable = shutil.which("prettier")
         if not executable:
             utils.error("prettier is not installed")
             return 1
 
-        files = []
+        files = set()
+
+        extensions = self.get(
+            base.SECTION, "prettier", "extension", default=["js", "xml"]
+        )
         for path in paths:
-            files.extend(glob.glob(f"{path}/**/*.js", recursive=True))
+            for ext in extensions:
+                files.update(glob.glob(f"{path}/**/*.{ext}", recursive=True))
 
-        files = list(
+        files = sorted(
             filter(
                 lambda path: not any(
                     fnmatch(path, f"*/{pattern}")
@@ -132,21 +137,24 @@ def _ci_prettier(self, options, args, paths, ignores):
         if not files:
             return 0
 
-        cmd = ["prettier"]
+        cmd = ["prettier", "--check"]
         if options.fix:
             cmd.append("--write")
 
         return utils.call(*cmd, *args, *files, pipe=False)
 
     def _ci_pylint(self, options, args, paths, ignores):
         """Run pylint tests for Odoo"""
-        files = []
+        files = set()
+
+        extensions = self.get(
+            base.SECTION, "pylint", "extension", default=["csv", "py", "xml"]
+        )
         for path in paths:
-            files.extend(glob.glob(f"{path}/**/*.csv", recursive=True))
-            files.extend(glob.glob(f"{path}/**/*.py", recursive=True))
-            files.extend(glob.glob(f"{path}/**/*.xml", recursive=True))
+            for ext in extensions:
+                files.update(glob.glob(f"{path}/**/*.{ext}", recursive=True))
 
-        files = list(
+        files = sorted(
             filter(
                 lambda path: not any(
                     fnmatch(path, f"*/{pattern}")
@@ -169,15 +177,15 @@ def _ci_pylint(self, options, args, paths, ignores):
 
     def _ci_paths(self):
         return self.get("odoo", "addons_path", default=[]) + self.get(
-            "bootstrap", "ci_path", default=[]
+            base.SECTION, "ci_path", default=[]
         )
 
     def ci(self, ci, args=None):
         """Run CI tests"""
         args, left = load_ci_arguments(args or [])
 
         # Always include this script in the tests
-        ignores = self.get("bootstrap", "blacklist", default=[])
+        ignores = self.get(base.SECTION, "blacklist", default=[])
         func = getattr(self, f"_ci_{ci}", None)
         if ci in CI and callable(func):
             return func(args, left, self._ci_paths(), ignores)

tests/test_ci.py

@@ -6,7 +6,6 @@
 from unittest import mock
 
 import pytest
-
 from doblib import base
 from doblib.ci import CIEnvironment
 
@@ -145,15 +144,16 @@ def test_ci_prettier(which, call, env):
     with mock.patch(
         "glob.glob",
         return_value=[
-            "test15/path/file.py",
-            "folder/test123/file.py",
             "folder/path/test196.py",
+            "folder/test123/file.py",
+            "test15/path/file.py",
             "test2/path/file.py",
         ],
     ):
         assert env.ci("prettier", ["--fix"]) == 42
         call.assert_called_once_with(
             "prettier",
+            "--check",
             "--write",
             "test2/path/file.py",
             pipe=False,
@@ -178,8 +178,6 @@ def test_ci_pylint(call, glob, env):
         "pylint",
         "--rcfile=.pylintrc",
         "test2/path/file.py",
-        "test2/path/file.py",
-        "test2/path/file.py",
         pipe=False,
     )
 
@@ -191,8 +189,6 @@ def test_ci_pylint(call, glob, env):
         "pylint",
         "--rcfile=.pylintrc",
         "test2/path/file.py",
-        "test2/path/file.py",
-        "test2/path/file.py",
         pipe=False,
     )