antsibull-nox 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

antsibull_nox/__init__.py

@@ -17,7 +17,7 @@ from .config import (
 from .interpret_config import interpret_config
 from .sessions.ansible_test import add_ansible_test_session
 
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
 
 def load_antsibull_nox_toml() -> None:

antsibull_nox/ansible.py

@@ -87,13 +87,13 @@ _SUPPORTED_CORE_VERSIONS: dict[Version, AnsibleCoreInfo] = {
             ["3.11", "3.12", "3.13"],
             ["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
         ],
+        "2.20": [
+            ["3.11", "3.12", "3.13"],
+            ["3.9", "3.10", "3.11", "3.12", "3.13"],
+        ],
         # The following might need updates. Look for the "``ansible-core`` support matrix" table in:
         # https://github.com/ansible/ansible-documentation/blob/devel/docs/docsite/rst/reference_appendices/release_and_maintenance.rst?plain=1
         # It contains commented-out entries for future ansible-core versions.
-        "2.20": [
-            ["3.12", "3.13", "3.14"],
-            ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"],
-        ],
         "2.21": [
             ["3.12", "3.13", "3.14"],
             ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"],
@@ -118,8 +118,8 @@ _SUPPORTED_CORE_VERSIONS: dict[Version, AnsibleCoreInfo] = {
 }
 
 _MIN_SUPPORTED_VERSION = Version.parse("2.9")
-_CURRENT_DEVEL_VERSION = Version.parse("2.19")
-_CURRENT_MILESTONE_VERSION = Version.parse("2.19")
+_CURRENT_DEVEL_VERSION = Version.parse("2.20")
+_CURRENT_MILESTONE_VERSION = Version.parse("2.20")
 
 
 def get_ansible_core_info(

antsibull_nox/data/get-package-versions.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
+# Copyright (c) 2025, Felix Fontein <felix@fontein.de>
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt
+# or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""Retrieve the version of one or more packages."""
+
+from __future__ import annotations
+
+import json
+import sys
+from importlib.metadata import PackageNotFoundError, version
+
+from antsibull_nox_data_util import get_list_of_strings, setup  # type: ignore
+
+
+def main() -> int:
+    """Main entry point."""
+    paths, extra_data = setup()
+
+    packages = get_list_of_strings(extra_data, "packages", default=[])
+
+    result: dict[str, str | None] = {}
+    for package in packages:
+        try:
+            result[package] = version(package)
+        except PackageNotFoundError:
+            result[package] = None
+    print(json.dumps(result))
+    return 0
+
+
+if __name__ == "__main__":
+    sys.exit(main())

antsibull_nox/sessions/docs_check.py

@@ -23,7 +23,9 @@ from .collections import (
     prepare_collections,
 )
 from .utils import (
+    get_package_version,
     install,
+    is_new_enough,
     run_bare_script,
 )
 
@@ -93,6 +95,9 @@ def add_docs_check(
     def execute_antsibull_docs(
         session: nox.Session, prepared_collections: CollectionSetup
     ) -> None:
+        antsibull_docs_version = get_package_version(session, "antsibull-docs")
+        if antsibull_docs_version is not None:
+            session.log(f"Detected antsibull-docs version {antsibull_docs_version}")
         with session.chdir(prepared_collections.current_path):
             collections_path = f"{prepared_collections.current_place}"
             command = [
@@ -104,6 +109,8 @@ def add_docs_check(
             ]
             if validate_collection_refs:
                 command.extend(["--validate-collection-refs", validate_collection_refs])
+            if is_new_enough(antsibull_docs_version, min_version="2.18.0"):
+                command.append("--check-extra-docs-refs")
             session.run(*command, env={"ANSIBLE_COLLECTIONS_PATH": collections_path})
 
     def docs_check(session: nox.Session) -> None:

antsibull_nox/sessions/utils.py

@@ -10,6 +10,7 @@ Utils for creating nox sessions.
 
 from __future__ import annotations
 
+import json
 import logging
 import os
 import sys
@@ -19,6 +20,8 @@ from pathlib import Path
 
 import nox
 from nox.logger import OUTPUT as nox_OUTPUT
+from packaging.version import InvalidVersion
+from packaging.version import parse as parse_version
 
 from ..data_util import prepare_data_script
 from ..paths import (
@@ -151,6 +154,86 @@ def run_bare_script(
     )
 
 
+def get_package_versions(
+    session: nox.Session,
+    /,
+    packages: list[str] | str,
+    *,
+    use_session_python: bool = True,
+) -> None | dict[str, str | None]:
+    """
+    Retrieve the versions of one or more Python packages.
+    """
+    name = "get-package-versions"
+    if isinstance(packages, str):
+        packages = [packages]
+    if not packages:
+        return {}
+    data = prepare_data_script(
+        session,
+        base_name=name,
+        paths=[],
+        extra_data={
+            "packages": packages,
+        },
+    )
+    python = sys.executable
+    env = {}
+    if use_session_python:
+        python = "python"
+        env["PYTHONPATH"] = str(find_data_directory())
+    result = session.run(
+        python,
+        find_data_directory() / f"{name}.py",
+        "--data",
+        data,
+        external=True,
+        silent=True,
+        env=env,
+    )
+    if result is None:
+        return None
+    return json.loads(result)
+
+
+def get_package_version(
+    session: nox.Session,
+    /,
+    package: str,
+    *,
+    use_session_python: bool = True,
+) -> str | None:
+    """
+    Retrieve a Python package's version.
+    """
+    result = get_package_versions(
+        session, package, use_session_python=use_session_python
+    )
+    return None if result is None else result.get(package)
+
+
+def is_new_enough(actual_version: str | None, *, min_version: str) -> bool:
+    """
+    Given a program version, compares it to the min_version.
+    If the program version is not given, it is assumed to be "new enough".
+    """
+    if actual_version is None:
+        return True
+    try:
+        act_v = parse_version(actual_version)
+    except InvalidVersion as exc:
+        raise ValueError(
+            f"Cannot parse actual version {actual_version!r}: {exc}"
+        ) from exc
+    try:
+        min_v = parse_version(min_version)
+    except InvalidVersion as exc:
+        raise ValueError(
+            f"Cannot parse minimum version {min_version!r}: {exc}"
+        ) from exc
+    return act_v >= min_v
+
+
 def compose_description(
     *,
     prefix: str | dict[t.Literal["one", "other"], str] | None = None,
@@ -197,8 +280,11 @@ def compose_description(
 __all__ = [
     "ci_group",
     "compose_description",
+    "get_package_version",
+    "get_package_versions",
     "get_registered_sessions",
     "install",
+    "is_new_enough",
     "nox_has_verbosity",
     "register",
     "run_bare_script",

{antsibull_nox-0.6.0.dist-info → antsibull_nox-0.7.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: antsibull-nox
-Version: 0.6.0
+Version: 0.7.0
 Summary: Changelog tool for Ansible-core and Ansible collections
 Project-URL: Documentation, https://ansible.readthedocs.io/projects/antsibull-nox/
 Project-URL: Source code, https://github.com/ansible-community/antsibull-nox/

{antsibull_nox-0.6.0.dist-info → antsibull_nox-0.7.0.dist-info}/RECORD

@@ -1,6 +1,6 @@
-antsibull_nox/__init__.py,sha256=oWRofJnJ6IoHttvzFvw0tBvebvTuJ1UKb6C_FSUMjTo,845
+antsibull_nox/__init__.py,sha256=ckHydw6Ts2rrrm2iLtHD3zxDxG1JkL6YGHBL8_HrFbY,845
 antsibull_nox/_pydantic.py,sha256=VTIh-u0TpWvnY6Dhe4ba8nAmR2tYmz4PXNp2_8Sr9pw,3203
-antsibull_nox/ansible.py,sha256=2EgaPK9ckS_KYTgpvb5HU9UOb6q5dpP3Az8sr1S7MU4,9346
+antsibull_nox/ansible.py,sha256=bPMwpkhk16ALoOfylFUK_sMKMhAXP5h7qyviDlC9A1Y,9338
 antsibull_nox/cli.py,sha256=NKeRlWc_0taNRcZcdMv9LHZ5nCz8-DEJxBLPxJ9vFYQ,3358
 antsibull_nox/config.py,sha256=_wPvRQ_RZq0qBXEU0o6Kxf-SbU3nRZZSo-5bYHdeUts,12240
 antsibull_nox/data_util.py,sha256=7FVoqESEc-_QdqrQ16K1AHRVHEglNbRCH_mNaYDJ7a4,953
@@ -22,6 +22,7 @@ antsibull_nox/data/action-groups.py,sha256=SoKoBXYoI_zCoFJ6p39_46M9lWzhwFeCQ8kib
 antsibull_nox/data/antsibull-nox-lint-config.py,sha256=tXkKd9AqgfDs5w7S6OaBIt9HnT0KSbiQIU9tFxtYE2U,657
 antsibull_nox/data/antsibull_nox_data_util.py,sha256=KBviE-NslEjmow1C5eORxj579RXobihEixClj-lrCgE,3350
 antsibull_nox/data/file-yamllint.py,sha256=hlS9tULwQSUMkdbYFfGtQGcPSj2scxEay6IalQfjSFE,3625
+antsibull_nox/data/get-package-versions.py,sha256=GRp6cNf-aN_05d8-WOBtp6EcRja4-VFBjcB92xS_pFA,940
 antsibull_nox/data/license-check.py,sha256=or3GyQC0WWYMxMqL-369krGsHaySH1vX-2fwpRyJGp0,5665
 antsibull_nox/data/license-check.py.license,sha256=iPdFtdkeE3E2nCB-M5KHevbz4d5I-6ymOnKNTc954Dw,218
 antsibull_nox/data/no-trailing-whitespace.py,sha256=vPbrTWR-GRIb0SVTY-jV5nTkMJQP8Ta0wD73eBu5N40,1596
@@ -34,13 +35,13 @@ antsibull_nox/sessions/ansible_lint.py,sha256=ik2heGsvpRwYm_4XGwlm53UvWQ_7FHDWaB
 antsibull_nox/sessions/ansible_test.py,sha256=apHRgq8n2VDCEAce9wN6di9vM9ZNQKvXH4bhifefLvI,21006
 antsibull_nox/sessions/build_import_check.py,sha256=QgM5531eqo3AD7LPOJUKW3I23peEpb6oFLa6uu9DUv4,3683
 antsibull_nox/sessions/collections.py,sha256=nhj_W2tbnsVJw6p7NkyP1xvmr3ZUmSJzwVuK0HE3oxw,4681
-antsibull_nox/sessions/docs_check.py,sha256=cDZP175g1Syxmula516DDgvMcAi-idSqK4MUPiRqVmw,4205
+antsibull_nox/sessions/docs_check.py,sha256=L9nn6_yshSNFAYSTxjWYegMQzegudaJ-3-tvD69GGW4,4595
 antsibull_nox/sessions/extra_checks.py,sha256=hKa6x1WaUSaVXvAN1ojM_tXkSTmHfd5A-2eBasyVkss,4910
 antsibull_nox/sessions/license_check.py,sha256=t5ut4ZluhFfk-qE6kcU8VNdvIGvzND81N7WCsbA4jLc,1824
 antsibull_nox/sessions/lint.py,sha256=GWXKmrfXIjWRDi3ztDVvbbGLom70-mZncYZm6zjeq-E,28072
-antsibull_nox/sessions/utils.py,sha256=rrQdzmjdrLQula8t-BCTKbO-tAmzfOKHNn1pN2B1QVc,5632
-antsibull_nox-0.6.0.dist-info/METADATA,sha256=dksNh3BabImd0iN2jm7YIH3UWlzb3pVHROuZDr1_A0g,7896
-antsibull_nox-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-antsibull_nox-0.6.0.dist-info/entry_points.txt,sha256=solWA9TCB37UlaGk8sHXxJg-k1HWckfKdncHDBsVSsI,57
-antsibull_nox-0.6.0.dist-info/licenses/LICENSES/GPL-3.0-or-later.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-antsibull_nox-0.6.0.dist-info/RECORD,,
+antsibull_nox/sessions/utils.py,sha256=FlZZJvATdca_cFZeMqoEv1Bfdv971VAta1KyA4W3pi0,7840
+antsibull_nox-0.7.0.dist-info/METADATA,sha256=kZd3w0-kMvbuZMpFUL3FHZo9iZ43mLEmm_-q4MubqJ0,7896
+antsibull_nox-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+antsibull_nox-0.7.0.dist-info/entry_points.txt,sha256=solWA9TCB37UlaGk8sHXxJg-k1HWckfKdncHDBsVSsI,57
+antsibull_nox-0.7.0.dist-info/licenses/LICENSES/GPL-3.0-or-later.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+antsibull_nox-0.7.0.dist-info/RECORD,,