Merge branch 'main' into patch-1

Author: alisonlhart

.config/dictionary.txt

@@ -1,25 +1,3 @@
-Chamoulaud
-Codeclimate
-FQCN
-FQCNs
-LIBYAML
-LINEINFILE
-Lineinfile
-Lintable
-MYSQLD
-NODEPS
-Octals
-PYTHONBREAKPOINT
-PYTHONIOENCODING
-PYTHONPYCACHEPREFIX
-Parseable
-Representer
-SARIF
-Sarif
-Sbarnea
-Sorin
-Tsukinowa
-WSLENV
 alertmanager
 ansiblelint
 apport
@@ -29,6 +7,7 @@ blockinfile
 bracketsmatchtest
 bracketsmatchtestfile
 cachier
+chamoulaud
 codeclimate
 codespell
 deannotate
@@ -43,6 +22,7 @@ filesspot
 firewalld
 fontawesome
 fqcn
+fqcns
 geerlingguy
 getmatches
 gplv
@@ -60,6 +40,7 @@ lintable
 lintables
 matchyaml
 mockings
+mysqld
 netcommon
 nodeps
 nomatchestest
@@ -72,17 +53,21 @@ pfexec
 plainexamples
 pmrun
 pymdownx
+pythonbreakpoint
+pythonioencoding
+pythonpycacheprefix
 redirections
 reformatter
 releasenotes
-representer
 rulebooks
 runas
 sarif
+sbarnea
 seealso
 sesu
 simplifiable
 slackpkg
+sorin
 ssbarnea
 sudosu
 supervisorctl
@@ -96,6 +81,7 @@ timesyncd
 tmpfs
 tombi
 tomlsort
+tsukinowa
 typehints
 uncook
 unjinja
@@ -105,5 +91,6 @@ untemplated
 virtnet
 willthames
 workerinput
+wslenv
 xdist
 yatesr

.config/requirements-lock.txt

@@ -1,20 +1,20 @@
 # This file was autogenerated by uv via the following command:
 #    uv export --no-dev --no-emit-package ansible-core --no-emit-package resolvelib --no-emit-package ruamel-yaml-clib --no-emit-package tomli --no-emit-package typing-extensions --no-emit-project --no-hashes -o .config/requirements-lock.txt
-ansible-compat==25.8.2
+ansible-compat==25.12.0
     # via ansible-lint
 attrs==25.4.0
     # via
     #   jsonschema
     #   referencing
-black==25.9.0
+black==25.11.0
     # via ansible-lint
 bracex==2.6
     # via wcmatch
 cffi==2.0.0
     # via
     #   ansible-lint
     #   cryptography
-click==8.3.0
+click==8.3.1
     # via black
 colorama==0.4.6 ; sys_platform == 'win32'
     # via click
@@ -26,8 +26,6 @@ distro==1.9.0
     # via ansible-lint
 filelock==3.20.0
     # via ansible-lint
-importlib-metadata==8.7.0
-    # via ansible-lint
 jinja2==3.1.6
     # via ansible-core
 jsonschema==4.25.1
@@ -68,7 +66,7 @@ referencing==0.37.0
     #   ansible-lint
     #   jsonschema
     #   jsonschema-specifications
-rpds-py==0.28.0
+rpds-py==0.30.0
     # via
     #   jsonschema
     #   referencing
@@ -82,5 +80,3 @@ wcmatch==10.1
     # via ansible-lint
 yamllint==1.37.1
     # via ansible-lint
-zipp==3.23.0
-    # via importlib-metadata

.github/workflows/redirects.yml

@@ -18,7 +18,7 @@ jobs:
     environment: release
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: actions/setup-python@v6
 
       - name: Upgrade Python toolchain

.github/workflows/release.yml

@@ -43,7 +43,7 @@ jobs:
         run: python3 -m pip install --user "tox>=4.0.0"
 
       - name: Check out src from Git
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0 # needed by setuptools-scm
           submodules: true

.pre-commit-config.yaml

@@ -30,7 +30,7 @@ repos:
     hooks:
       - id: check-useless-excludes
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.9.7
+    rev: 0.9.13
     hooks:
       - id: uv-sync
       - id: uv-lock
@@ -58,14 +58,14 @@ repos:
           - "-o"
           - ".config/requirements-lock.txt"
   - repo: https://github.com/biomejs/pre-commit
-    rev: "v2.3.2"
+    rev: "v2.3.8"
     hooks:
       - id: biome-check
         name: biome
         alias: biome
         args: [--unsafe]
   - repo: https://github.com/streetsidesoftware/cspell-cli
-    rev: v9.2.1
+    rev: v9.3.3
     hooks:
       - id: cspell
         entry: bash
@@ -75,11 +75,11 @@ repos:
             "-euo",
             "pipefail",
             "-c",
-            "cspell-cli . --relative --no-progress --no-summary && cspell-cli . --disable-dictionary=words --no-exit-code --words-only --quiet --unique | LC_ALL=C sort > .config/dictionary.txt",
+            "cspell-cli . --relative --no-progress --no-summary && cspell-cli . --disable-dictionary=words --no-exit-code --words-only --quiet --unique | tr '[:upper:]' '[:lower:]' | LC_ALL=C sort -u > .config/dictionary.txt",
           ]
         name: cspell + remove unused and sort dictionary
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.34.1
+    rev: 0.35.0
     hooks:
       - id: check-github-workflows
   - repo: https://github.com/pre-commit/pre-commit-hooks.git
@@ -145,15 +145,15 @@ repos:
         entry: yamllint --strict
 
   - repo: https://github.com/tombi-toml/tombi-pre-commit
-    rev: v0.6.40
+    rev: v0.7.0
     hooks:
       - id: tombi-format
         alias: toml
       - id: tombi-lint
         alias: toml
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.3
+    rev: v0.14.7
     hooks:
       - id: ruff-format
         alias: ruff
@@ -171,7 +171,6 @@ repos:
           - black>=22.10.0
           - cryptography>=39.0.1
           - filelock>=3.12.2
-          - importlib_metadata
           - jinja2
           - license-expression >= 30.3.0
           - pip>=22.3.1
@@ -191,7 +190,7 @@ repos:
       - id: pyright
         additional_dependencies: *deps
   - repo: https://github.com/pycqa/pylint
-    rev: v4.0.2
+    rev: v4.0.3
     hooks:
       - id: pylint
         args:
@@ -201,6 +200,10 @@ repos:
     rev: v2.14
     hooks:
       - id: vulture
+  - repo: https://github.com/ansible/team-devtools
+    rev: v25.12.8
+    hooks:
+      - id: check-platform-constraints
   - # keep at bottom as these are slower
     repo: local
     hooks:

package-lock.json

@@ -34,18 +34,17 @@ classifiers = [
 ]
 dependencies = [
   "ansible-compat>=25.8.2",
-  "ansible-core>=2.17.10",
+  "ansible-core>=2.16.14",
   "black>=24.3.0",
-  "cffi>=1.17.1",  # indirect dependency of ruamel-yaml
+  "cffi>=1.15.1",  # indirect dependency of ruamel-yaml
   "cryptography>=38",
   "distro>=1.9.0",
   "filelock>=3.8.2",
-  "importlib-metadata>=8.7.0",
   "jsonschema>=4.10.0",
   "packaging>=22.0",
   "pathspec>=0.10.3",
-  "pyyaml>=6.0.2 ; python_version < '3.14'",
-  "pyyaml>=6.0.3 ; python_version >= '3.14'",  # py314 support
+  "pyyaml>=6.0.1 ; python_version < '3.14'",
+  "pyyaml>=6.0.1 ; python_version >= '3.14'",  # py314 support
   "referencing>=0.36.2",
   "ruamel-yaml>=0.18.11",
   "ruamel-yaml-clib>=0.2.12 ; python_version < '3.14'",
@@ -83,13 +82,13 @@ dev = [
   "psutil>=7.0.0",
   "pylint>=3.3.8",
   "pyrsistent>=0.20.0",
-  "pytest>=7.2.2",
+  "pytest>=9",
   "pytest-instafail>=0.5.0",
   "pytest-mock>=3.15.0",
   "pytest-plus>=0.8.1",
   "pytest-sugar>=1.1.1",
   "pytest-xdist[psutil,setproctitle]>=2.1.0",
-  "pyyaml>=6.0.2",
+  "pyyaml>=6.0.1",
   "ruamel-yaml>=0.18.11",
   "ruamel-yaml-clib>=0.2.12 ; python_full_version < '3.14'",
   "tox>=4.24.2",
@@ -103,7 +102,7 @@ lint = [
   "pip>=25.2",
   "pre-commit>=4.1",
   "pre-commit-uv>=4.1.4",
-  "pytest>=7.2.2",
+  "pytest>=9",
   "setuptools>=51.1.1",
 ]
 pkg = [
@@ -461,19 +460,15 @@ reportPossiblyUnboundVariable = false
 reportPrivateImportUsage = false
 
 # spell-checker:ignore filterwarnings norecursedirs optionflags
-[tool.pytest.ini_options]
+[tool.pytest]
 # do not add options here as this will likely break either console runs or IDE
 # integration like vscode or pycharm
-addopts = "-p no:pytest_cov --durations=10 --failed-first"
+addopts = ["--durations=10", "--failed-first", "-p no:pytest_cov"]
 doctest_optionflags = ["ALLOW_UNICODE", "ELLIPSIS"]
 filterwarnings = [
-  "error",
-  # https://sourceforge.net/p/ruamel-yaml/tickets/452/
-  "ignore:Deprecated call to `pkg_resources.declare_namespace:DeprecationWarning",
-  # https://github.com/spdx/tools-python/issues/507
-  "ignore:pkg_resources is deprecated as an API:DeprecationWarning",
   # We raise one non critical warning from our own conftest.py:
   "always::pytest.PytestWarning",
+  "error",
   # py312 ansible-core
   # https://github.com/ansible/ansible/issues/81906
   "ignore:'importlib.abc.TraversableResources' is deprecated and slated for removal in Python 3.14:DeprecationWarning",
@@ -492,11 +487,11 @@ norecursedirs = [
   ".cache",
   ".config",
   ".eggs",
+  ".eggs",
   ".git",
   ".github",
   ".mypy_cache",
   ".projects",
-  ".eggs",
   ".tox",
   "__pycache__",
   "ansible_collections",
@@ -511,17 +506,17 @@ norecursedirs = [
   "test/schemas",
 ]
 python_files = [
-  "test_*.py",
   # Ref: https://docs.pytest.org/en/latest/reference.html#confval-python_files
   # Needed to discover legacy nose test modules:
   "Test*.py",
   # Needed to discover embedded Rule tests
   "rules/*.py",
+  "test_*.py",
 ]
 # Using --pyargs instead of testpath as we embed some tests
 # See: https://github.com/pytest-dev/pytest/issues/6451#issuecomment-687043537
 # testpaths =
-xfail_strict = true
+strict_xfail = true
 
 [tool.ruff]
 cache-dir = "./.cache/.ruff"