antsibull-nox 0.4.0__py3-none-any.whl → 0.5.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.4.0"
+__version__ = "0.5.0"
 
 
 def load_antsibull_nox_toml() -> None:

antsibull_nox/config.py

@@ -275,6 +275,7 @@ class SessionAnsibleTestIntegrationWDefaultContainer(_BaseModel):
     except_versions: list[PAnsibleCoreVersion] = []
     core_python_versions: dict[t.Union[PAnsibleCoreVersion, str], list[PVersion]] = {}
     controller_python_versions_only: bool = False
+    ansible_vars_from_env_vars: dict[str, str] = {}
 
     @p.model_validator(mode="after")
     def _validate_core_keys(self) -> t.Self:

antsibull_nox/data/action-groups.py

@@ -113,7 +113,6 @@ def scan(config: list[ActionGroup], errors: list[str]) -> None:
     modules_directory = "plugins/modules/"
     modules_suffix = ".py"
 
-    errors = []
     for file in os.listdir(modules_directory):
         if not file.endswith(modules_suffix):
             continue

antsibull_nox/interpret_config.py

@@ -238,6 +238,7 @@ def _add_sessions(sessions: Sessions) -> None:
                 cfg.core_python_versions
             ),
             controller_python_versions_only=cfg.controller_python_versions_only,
+            ansible_vars_from_env_vars=cfg.ansible_vars_from_env_vars,
         )
     if sessions.ansible_lint:
         add_ansible_lint(

antsibull_nox/sessions/ansible_test.py

@@ -16,6 +16,7 @@ from collections.abc import Callable
 from pathlib import Path
 
 import nox
+from antsibull_fileutils.yaml import store_yaml_file
 
 from ..ansible import (
     AnsibleCoreVersion,
@@ -168,7 +169,7 @@ def add_ansible_test_sanity_test_session(
     """
     Add generic ansible-test sanity test session.
     """
-    command = ["sanity", "--docker", "-v", "--color"]
+    command = ["sanity", "--color", "-v", "--docker"]
     if skip_tests:
         for test in skip_tests:
             command.extend(["--skip", test])
@@ -302,7 +303,7 @@ def add_ansible_test_unit_test_session(
     add_ansible_test_session(
         name=name,
         description=description,
-        ansible_test_params=["units", "--docker", "-v", "--color"],
+        ansible_test_params=["units", "--color", "-v", "--docker"],
         extra_deps_files=["tests/unit/requirements.yml"],
         default=default,
         ansible_core_version=ansible_core_version,
@@ -397,6 +398,7 @@ def add_ansible_test_integration_sessions_default_container(
         dict[str | AnsibleCoreVersion, list[str | Version]] | None
     ) = None,
     controller_python_versions_only: bool = False,
+    ansible_vars_from_env_vars: dict[str, str] | None = None,
     default: bool = False,
 ) -> None:
     """
@@ -409,6 +411,18 @@ def add_ansible_test_integration_sessions_default_container(
     controller Python versions.
     """
 
+    def callback_before() -> None:
+        if not ansible_vars_from_env_vars:
+            return
+
+        path = Path("tests", "integration", "integration_config.yml")
+        content: dict[str, t.Any] = {}
+        for ans_var, env_var in ansible_vars_from_env_vars.items():
+            value = os.environ.get(env_var)
+            if value is not None:
+                content[ans_var] = env_var
+        store_yaml_file(path, content, nice=True, sort_keys=True)
+
     def add_integration_tests(
         ansible_core_version: AnsibleCoreVersion,
         repo_name: str | None = None,
@@ -459,10 +473,10 @@ def add_ansible_test_integration_sessions_default_container(
                 description=description,
                 ansible_test_params=[
                     "integration",
+                    "--color",
+                    "-v",
                     "--docker",
                     "default",
-                    "-v",
-                    "--color",
                     "--python",
                     str(py_version),
                 ],
@@ -470,6 +484,7 @@ def add_ansible_test_integration_sessions_default_container(
                 ansible_core_version=ansible_core_version,
                 ansible_core_repo_name=repo_name,
                 ansible_core_branch_name=branch_name,
+                callback_before=callback_before,
                 default=False,
                 register_name="integration",
                 register_extra_data={

{antsibull_nox-0.4.0.dist-info → antsibull_nox-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: antsibull-nox
-Version: 0.4.0
+Version: 0.5.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.4.0.dist-info → antsibull_nox-0.5.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-antsibull_nox/__init__.py,sha256=D9rbPsKuklFL2MNeCAGCo6Qrm1C71Gaje9Om-vviX4k,845
+antsibull_nox/__init__.py,sha256=fLhKsS6G8ngf77hrMr29GZp4IcLZusw_P-TW-QJ1SX8,845
 antsibull_nox/_pydantic.py,sha256=VTIh-u0TpWvnY6Dhe4ba8nAmR2tYmz4PXNp2_8Sr9pw,3203
 antsibull_nox/ansible.py,sha256=2EgaPK9ckS_KYTgpvb5HU9UOb6q5dpP3Az8sr1S7MU4,9346
 antsibull_nox/cli.py,sha256=NKeRlWc_0taNRcZcdMv9LHZ5nCz8-DEJxBLPxJ9vFYQ,3358
-antsibull_nox/config.py,sha256=SNiqRhu5P6XS-Uve0faLTEG0THaMEoiYti-n9-f_Kec,11037
+antsibull_nox/config.py,sha256=vuyq4m-IuIc7nHhQM5E7X8MN2DCOfW6UxOahZhOoX5Y,11089
 antsibull_nox/data_util.py,sha256=7FVoqESEc-_QdqrQ16K1AHRVHEglNbRCH_mNaYDJ7a4,953
 antsibull_nox/init.py,sha256=eRltIrS3AcHqEHk2yNAqJXv7kR6m_ysvFxIHpowd-2M,2259
-antsibull_nox/interpret_config.py,sha256=tEG6Hr7kQVpZrSAbprSqrlsVa7oPfUUcKd7WxiC5t84,10844
+antsibull_nox/interpret_config.py,sha256=l2_yJ9G8Ls_JvMtJDdnuRL-ViPMy4XM3lPHXaR6giso,10915
 antsibull_nox/lint_config.py,sha256=ZnsUbX6IdQK_IP9nvs8Kk6jb5lPdiREFSHAUuEGGceU,3848
 antsibull_nox/paths.py,sha256=86HOynhCMTVop3ml_77JI06vM9nyK7PHMzLP_4M0V88,6317
 antsibull_nox/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -16,7 +16,7 @@ antsibull_nox/collection/data.py,sha256=HmnASNuv97xFM08gYuQcAF3Nz6Oc6eXd5NN-wbMt
 antsibull_nox/collection/extract.py,sha256=qNVknQRtRrCt10aawuU1Z6NTs16CA1bUEX3WDGBw68g,684
 antsibull_nox/collection/install.py,sha256=xRXJ0kY8J1eOMmtHBZC6DqG38BF-RhjhvLF-GRT-Bb0,21622
 antsibull_nox/collection/search.py,sha256=WZkcgNldl-feAqtKvn9fMMFxJ46kLeS0mqU-5R6yt7o,19296
-antsibull_nox/data/action-groups.py,sha256=qLuh2YqIpc6i2jpWFzjtFhZhx6_SDbbvJe6VH7EXrqg,6934
+antsibull_nox/data/action-groups.py,sha256=0rf5XfWU7sdoS7NyKHGNeWDkE5mFyN7p7IjHIuZYGw8,6918
 antsibull_nox/data/antsibull-nox-lint-config.py,sha256=tXkKd9AqgfDs5w7S6OaBIt9HnT0KSbiQIU9tFxtYE2U,657
 antsibull_nox/data/antsibull_nox_data_util.py,sha256=D4i_sKxjAeZuDV-z9Ibow0YYIqhXo2V_YC0LONLcEXM,2931
 antsibull_nox/data/file-yamllint.py,sha256=hlS9tULwQSUMkdbYFfGtQGcPSj2scxEay6IalQfjSFE,3625
@@ -26,7 +26,7 @@ antsibull_nox/data/no-unwanted-files.py,sha256=_B3m-XWvWpdzGN-XAP8rLIS_5RMJGntFW
 antsibull_nox/data/plugin-yamllint.py,sha256=bPIFmNwuTznaUjUhebccFa0IF_joyjIO7d3uF2HqjZQ,8466
 antsibull_nox/sessions/__init__.py,sha256=4wTTO1E6rdCz4pVMuGUeuXi_vqFaH4whAL9qcjfOqto,2022
 antsibull_nox/sessions/ansible_lint.py,sha256=ik2heGsvpRwYm_4XGwlm53UvWQ_7FHDWaBt7ttvUYbU,1661
-antsibull_nox/sessions/ansible_test.py,sha256=uZ5fa9fBY-D4BBWqgl1bI-GfpKmXAu9YKC5G4ajum18,20379
+antsibull_nox/sessions/ansible_test.py,sha256=apHRgq8n2VDCEAce9wN6di9vM9ZNQKvXH4bhifefLvI,21006
 antsibull_nox/sessions/build_import_check.py,sha256=kdr_Cqc0jb8XQQ-2QL-g_X7wgezE04oMVFCPr7a34iA,4719
 antsibull_nox/sessions/collections.py,sha256=nhj_W2tbnsVJw6p7NkyP1xvmr3ZUmSJzwVuK0HE3oxw,4681
 antsibull_nox/sessions/docs_check.py,sha256=mVYt278xy5AVwo5rCf6FLZlhqBiEYgJ3mmWsVBShKD0,2344
@@ -34,8 +34,8 @@ antsibull_nox/sessions/extra_checks.py,sha256=sBn0YFD8cM3OqeQ4UgYwD0NAcjKnYoy2zd
 antsibull_nox/sessions/license_check.py,sha256=t5ut4ZluhFfk-qE6kcU8VNdvIGvzND81N7WCsbA4jLc,1824
 antsibull_nox/sessions/lint.py,sha256=Idl3g3CB_zqlDbrCvItkjvYMw4TzbBcQWQnYLt5AL5Y,21639
 antsibull_nox/sessions/utils.py,sha256=rrQdzmjdrLQula8t-BCTKbO-tAmzfOKHNn1pN2B1QVc,5632
-antsibull_nox-0.4.0.dist-info/METADATA,sha256=h--FXM-iETEiwgpBeIGAQajtcGMWAkwjKmyuFoOCZFg,7670
-antsibull_nox-0.4.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-antsibull_nox-0.4.0.dist-info/entry_points.txt,sha256=solWA9TCB37UlaGk8sHXxJg-k1HWckfKdncHDBsVSsI,57
-antsibull_nox-0.4.0.dist-info/licenses/LICENSES/GPL-3.0-or-later.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-antsibull_nox-0.4.0.dist-info/RECORD,,
+antsibull_nox-0.5.0.dist-info/METADATA,sha256=QcqWvDOeVpFEUzGOzBjRGLyMKExKgSHCJfSVsIW5E6U,7670
+antsibull_nox-0.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+antsibull_nox-0.5.0.dist-info/entry_points.txt,sha256=solWA9TCB37UlaGk8sHXxJg-k1HWckfKdncHDBsVSsI,57
+antsibull_nox-0.5.0.dist-info/licenses/LICENSES/GPL-3.0-or-later.txt,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+antsibull_nox-0.5.0.dist-info/RECORD,,