Merge branch 'OCA:main' into modoolar

Author: icvetkovic-modoolar

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 9.1.2
+current_version = 9.1.3
 commit = True
 tag = True
 sign_tags = True

.github/workflows/test.yml

@@ -21,7 +21,7 @@ jobs:
       fail-fast: false
       matrix:
         python: ['3.8', '3.9', '3.10', '3.11', '3.12']
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-13, macos-latest]
         tox_env: [py]
         include:
           - python: '3.12'
@@ -33,6 +33,16 @@ jobs:
           - python: '3.12'
             os: ubuntu-latest
             tox_env: 'build'
+        exclude:
+          # macos-14 AKA macos-latest has switched to being an ARM runner, only supporting newer versions of Python
+          # https://github.com/actions/setup-python/issues/825#issuecomment-2096792396
+          - python: '3.8'
+            os: macos-latest
+          - python: '3.9'
+            os: macos-latest
+          - python: '3.10'
+            os: macos-latest
+
     steps:
     - name: Set git to not change EoL
       if: runner.os == 'Windows'
@@ -43,7 +53,7 @@ jobs:
       uses: actions/cache@v4
       with:
         path: ${{ env.PRE_COMMIT_CACHE }}
-        key: ${{ runner.os }}-py${{ matrix.python }}-pre-commit
+        key: ${{ runner.os }}-${{ runner.arch }}-py${{ matrix.python }}-pre-commit
     - uses: actions/[email protected]
       with:
         fetch-depth: 0

README.md

@@ -1,2 +1,6 @@
 [tool.black]
 line-length=119
+
+[build-system]
+requires = ["setuptools >=42"]
+build-backend = "setuptools.build_meta"

pyproject.toml

@@ -1,6 +1,6 @@
 [metadata]
 name = pylint-odoo
-version = 9.1.2
+version = 9.1.3
 author = Odoo Community Association (OCA)
 author_email = [email protected]
 summary = Pylint plugin for Odoo

setup.cfg

@@ -1,3 +1,3 @@
-__version__ = "9.1.2"
+__version__ = "9.1.3"
 
 from .plugin import register

src/pylint_odoo/__init__.py

@@ -228,8 +228,8 @@
     ),
     "W8116": ("Print used. Use `logger` instead.", "print-used", CHECK_DESCRIPTION),
     "W8120": (
-        "Translation method _(%s) is using positional string printf "
-        'formatting. Use named placeholder `_("%%(placeholder)s")` instead.',
+        "Translation method _(%s) is using positional string printf formatting with "
+        'multiple arguments. Use named placeholder `_("%%(placeholder)s")` instead.',
         "translation-positional-used",
         CHECK_DESCRIPTION,
     ),

src/pylint_odoo/checkers/odoo_addons.py

@@ -32,6 +32,7 @@
     "15.0",
     "16.0",
     "17.0",
+    "18.0",
 ]
 DFTL_MANIFEST_VERSION_FORMAT = r"({valid_odoo_versions})\.\d+\.\d+\.\d+$"
 

src/pylint_odoo/misc.py

@@ -6,6 +6,7 @@ pre-commit
 pytest
 pytest-cov
 pytest-xdist
+setuptools >=42
 tox
 twine
 wheel