chore: Remove cffi, importlib-metadata, reduce core lower bound (#4860)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Alison Hart <[email protected]>

Author: 3 people

.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

@@ -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
@@ -82,5 +80,3 @@ wcmatch==10.1
     # via ansible-lint
 yamllint==1.37.1
     # via ansible-lint
-zipp==3.23.0
-    # via importlib-metadata

.pre-commit-config.yaml

@@ -65,7 +65,7 @@ repos:
         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,7 +75,7 @@ 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
@@ -145,7 +145,7 @@ 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
@@ -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
@@ -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:

pyproject.toml

@@ -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'",
@@ -89,7 +88,7 @@ dev = [
   "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",

renovate.json

@@ -1,4 +1,51 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>ansible/actions//config/renovate.json"]
+  "extends": ["github>ansible/actions//config/renovate.json"],
+  "packageRules": [
+    {
+      "allowedVersions": "<2.17",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["ansible-core"]
+    },
+    {
+      "allowedVersions": "<1.16",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["cffi"]
+    },
+    {
+      "allowedVersions": "<4.3",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["django"]
+    },
+    {
+      "allowedVersions": "<6.1",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["importlib-metadata"]
+    },
+    {
+      "allowedVersions": "<4.22",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["jsonschema"]
+    },
+    {
+      "allowedVersions": "<25.0",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["packaging"]
+    },
+    {
+      "allowedVersions": "<6.0.2",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["pyyaml"]
+    },
+    {
+      "allowedVersions": "<0.5.3",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["python-gnupg"]
+    },
+    {
+      "allowedVersions": "<65.6",
+      "description": "Platform compatibility constraint",
+      "matchPackageNames": ["setuptools"]
+    }
+  ]
 }

src/ansiblelint/requirements.py

@@ -1,6 +1,7 @@
 """Utilities for checking python packages requirements."""
 
-import importlib_metadata
+from importlib.metadata import metadata
+
 from packaging.requirements import Requirement
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
@@ -13,9 +14,9 @@ class Reqs(dict[str, SpecifierSet]):
 
     def __init__(self, name: str = "ansible-lint") -> None:
         """Load linter metadata requirements."""
-        metadata = importlib_metadata.metadata(name)
-        if metadata:
-            for req_str in metadata.json["requires_dist"]:
+        lint_metadata = metadata(name)
+        if lint_metadata:
+            for req_str in lint_metadata.json["requires_dist"]:
                 req = Requirement(req_str)
                 if req.name:
                     if req.marker and not req.marker.evaluate():

src/ansiblelint/rules/args.py

@@ -346,4 +346,12 @@ def test_args_module_pass(
         with caplog.at_level(logging.WARNING):
             results = Runner(success, rules=default_rules_collection).run()
         assert len(results) == 0, results
-        assert len(caplog.records) == 0, caplog.records
+        # Remove any records about incompatible ansible version with the collections
+        # Sample: AnsibleWarning Collection community.docker does not support Ansible version
+        records = [
+            record
+            for record in caplog.records
+            if "does not support Ansible version" not in record.getMessage()
+        ]
+        log_string = "\n".join(record.getMessage() for record in records)
+        assert len(records) == 0, log_string

src/ansiblelint/schemas/__store__.json

@@ -1,6 +1,6 @@
 {
   "ansible-lint-config": {
-    "etag": "edfce2b56aae684bf1f0b9978dcfaaaa588dbc236f6e0ce29427277f6a327ddc",
+    "etag": "d08ce380364a2935299f89bf453787601d44a1bc6b70a38afaec4a8b0b80d104",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible-lint-config.json"
   },
   "ansible-navigator-config": {
@@ -12,55 +12,55 @@
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/changelog.json"
   },
   "execution-environment": {
-    "etag": "075ab552988793a43ddfe9907b0e391331c54b5dbee2ad1a194e6fc9268e5df9",
+    "etag": "127ca906c1dc04fe55e4dd1ee0742a096a40f094ec3d4418b803456713c35243",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/execution-environment.json"
   },
   "galaxy": {
-    "etag": "53510178f6231be276d4fdb1b99e0db2bf52a6fedfaa634f9870537d9ad1b385",
+    "etag": "fbee11277e3cf6fd3ae47831fb912dda5954e2689d1830ddaba7cbac1fd0ce3b",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/galaxy.json"
   },
   "inventory": {
-    "etag": "b52c251a121e2e807928db7b4e09338babde9e74a50d0f74e8908f6e230d101d",
+    "etag": "d5f717b4df27cd750ce0acdcbfa2b7ad747815c8b98d4f6ea474a637ba04ce72",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/inventory.json"
   },
   "meta": {
-    "etag": "6315f4ea4ed7a14f3d011bbb3095ee56ed4621c4e7c1d14c85dcf88a5cfe3573",
+    "etag": "d63b91b4cb6a73cde4d9d98b7b5d9bbaf8ed568173e90682afb5b11cd6ba55b3",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/meta.json"
   },
   "meta-runtime": {
-    "etag": "448b614e9d4411b82d220950b7a415c248cc75d5431f9b8058c771a595d40163",
+    "etag": "eae3d798ca5ccb03b3fd81ec44ea3d579782e75d1bd5a96eb0d64b1939c3b1f1",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/meta-runtime.json"
   },
   "molecule": {
-    "etag": "3b625438c28e884ac42a14c09ca542fc3e1b4466abaf47d0c28646e0857d3fb5",
+    "etag": "c654d6e4f94ae56daa39f456d15d31c933977e2eb3f5031dca40533f25c32746",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/molecule.json"
   },
   "play-argspec": {
-    "etag": "b418c4edcf2a44f0534321e0b38b6b7fb3f73a87c4f6ea18cab15e4b3f53bd20",
+    "etag": "699edbc9ddf026606d8cd79f71b10f9487f6acc37e8622143f76e5e8d0ae14bf",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/play-argspec.json"
   },
   "playbook": {
-    "etag": "db849c713091b29d3a569e72a82f8a28f49b3b14ad90c1a96936099b04eb393e",
+    "etag": "09d087fd7fe850790857de197c778bbce80ec360234e3240e2eff964f773aa8c",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/playbook.json"
   },
   "requirements": {
-    "etag": "5ae3a6058ac626a341338c760db7cef7f02a8911c7293c7e129dbc6b0f8bb86d",
+    "etag": "4473c6fcaddcc040aa8357ed3fd2b316c5699c4cc1978dbf3935c29be35b8a62",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/requirements.json"
   },
   "role-arg-spec": {
-    "etag": "c470f67bc8eec3937957773074d7b6549deefd83dd0c3e13db725df166a66df3",
+    "etag": "cb7ac0c4f8d55736f8c53e27bc6984f67d12fda5eadca1991f50d5d78fcdfb63",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/role-arg-spec.json"
   },
   "rulebook": {
     "etag": "9f785b5986cdbfe3b4ba911cbb65263df150bb595b22e4f191081b9360717d33",
     "url": "https://raw.githubusercontent.com/ansible/ansible-rulebook/main/ansible_rulebook/schema/ruleset_schema.json"
   },
   "tasks": {
-    "etag": "9f3b54cf5cc432d57c9691fb3108a7f37996ab0875e2abb66eda0aa62437dcdc",
+    "etag": "0e94cba9067e983083040bd661515801b5b1d4fd5660019f34234bba7ec8de1a",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/tasks.json"
   },
   "vars": {
-    "etag": "73feaa77561d1d5b0bebe6cd66d499a28d67037055ac6d746139a38c9d28ca04",
+    "etag": "76e5ac2daa6465ba16c3a566307876cf6d74ff433cf7fd0836bc4a9e389b668a",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/vars.json"
   }
 }

test/schemas/src/schema.spec.ts

@@ -161,14 +161,14 @@ function getTestFiles(
 ): { file: string; expect_fail: boolean }[] {
   const files = Array.from(
     new Set(
-      globs.flatMap((glob: any) =>
+      globs.flatMap((glob: string) =>
         minimatch.match(test_files, path.join("**", glob)),
       ),
     ),
   );
   const negative_files = Array.from(
     new Set(
-      globs.flatMap((glob: any) =>
+      globs.flatMap((glob: string) =>
         minimatch.match(negative_test_files, path.join("**", glob)),
       ),
     ),
@@ -186,6 +186,12 @@ function getAllFiles(dir: string): string[] {
   return fs.readdirSync(dir).reduce((files: string[], file: string) => {
     const name = path.join(dir, file);
     const isDirectory = fs.statSync(name).isDirectory();
-    return isDirectory ? [...files, ...getAllFiles(name)] : [...files, name];
+    if (isDirectory) {
+      files.push(...getAllFiles(name));
+      return files;
+    } else {
+      files.push(name);
+      return files;
+    }
   }, []);
 }