Merge branch 'devel' into cli-restructure-part2

.github/workflows/pull-request-management.yml

@@ -128,7 +128,7 @@ jobs:
           - 'eos_cli_config_gen_deprecated_vars'
           - 'eos_cli_config_gen_negative_unit_tests'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
         # Also test minimum ansible version for one scenario.
         include:
           - avd_scenario: 'eos_cli_config_gen'
@@ -167,7 +167,7 @@ jobs:
       fail-fast: true
       matrix:
         avd_scenario: ['dhcp_configuration', 'dhcp_provisioning']
-        ansible_version: ['ansible-core<2.18.0 --upgrade']
+        ansible_version: ['ansible-core<2.19.0 --upgrade']
     needs: [ file-changes ]
     if: needs.file-changes.outputs.dhcp == 'true'
     steps:
@@ -234,6 +234,9 @@ jobs:
           - avd_scenario: 'eos_designs_unit_tests'
             ansible_version: 'ansible-core<2.18.0 --upgrade'
             pip_requirements: '.github/requirements-ci.txt'
+          - avd_scenario: 'eos_designs_unit_tests'
+            ansible_version: 'ansible-core<2.19.0 --upgrade'
+            pip_requirements: '.github/requirements-ci.txt'
     needs: [ file-changes ]
     if: needs.file-changes.outputs.eos_design == 'true' || needs.file-changes.outputs.config_gen == 'true'
     steps:
@@ -275,7 +278,7 @@ jobs:
         avd_scenario:
           - 'eos_config_deploy_cvp'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
         include:
           - avd_scenario: 'eos_config_deploy_cvp'
             ansible_version: 'ansible-core==2.15.0'
@@ -315,7 +318,7 @@ jobs:
         avd_scenario:
           - 'eos_validate_state'
         ansible_version:
-          - 'ansible-core<2.18.0 --upgrade'
+          - 'ansible-core<2.19.0 --upgrade'
         include:
           - avd_scenario: 'eos_validate_state'
             ansible_version: 'ansible-core==2.15.0'
@@ -363,7 +366,7 @@ jobs:
           # 3.13 - Still waiting for support in ansible-test
       - name: 'Install Python requirements'
         run: |
-          pip install "ansible-core<2.18.0" -r .github/requirements-ci.txt --upgrade
+          pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
       - name: 'Run ansible-test sanity'
         run: |
           cd ansible_collections/arista/avd/
@@ -385,7 +388,7 @@ jobs:
             3.10
       - name: 'Install Python requirements'
         run: |
-          pip install mock pytest pytest-mock pytest-xdist pyyaml "ansible-core<2.18.0" -r .github/requirements-ci.txt --upgrade
+          pip install mock pytest pytest-mock pytest-xdist pyyaml "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
       - name: 'Run ansible-test units test cases'
         run: |
           cd ansible_collections/arista/avd/
@@ -408,7 +411,7 @@ jobs:
           # 3.13 - Still waiting for support in ansible-test
       - name: 'Install Python requirements'
         run: |
-          pip install "ansible-core<2.18.0" -r .github/requirements-ci.txt --upgrade
+          pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
       - name: 'Run ansible-test integration test cases'
         run: |
           cd ansible_collections/arista/avd/
@@ -457,7 +460,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: 'Install Python & Ansible requirements'
         run: |
-          pip install "ansible-core<2.18.0" -r .github/requirements-ci.txt --upgrade
+          pip install "ansible-core<2.19.0" -r .github/requirements-ci.txt --upgrade
           ansible-galaxy collection install -r ansible_collections/arista/avd/collections.yml
       - name: Install galaxy-importer
         # Install the specific version of galaxy-importer used on galaxy.ansible.com

ansible_collections/arista/avd/meta/runtime.yml

@@ -1,5 +1,5 @@
 ---
-requires_ansible: '>=2.15.0,<2.18.0'
+requires_ansible: '>=2.15.0,<2.19.0'
 plugin_routing:
   filter:
     convert_dicts:

ansible_collections/arista/avd/plugins/modules/inventory_to_container.py

@@ -1,7 +1,7 @@
 # Copyright (c) 2019-2024 Arista Networks, Inc.
 # Use of this source code is governed by the Apache License 2.0
 # that can be found in the LICENSE file.
-
+from __future__ import annotations
 
 DOCUMENTATION = r"""
 ---

ansible_collections/arista/avd/requirements-dev.txt

@@ -6,7 +6,7 @@ PyYAML>=6.0.0
 treelib>=1.5.5
 jsonschema>=3.2.0
 # dev requirements
-ansible-core>=2.15.0,<2.18.0
+ansible-core>=2.15.0,<2.19.0
 ansible-doc-extractor>=0.1.10
 ansible-lint>=24.6.0
 aristaproto[compiler]>=0.1.1

ansible_collections/arista/avd/tests/sanity/ignore-2.18.txt

@@ -0,0 +1,12 @@
+plugins/modules/configlet_build_config.py validate-modules:missing-gplv3-license
+plugins/modules/eos_designs_documentation.py validate-modules:missing-gplv3-license
+plugins/modules/eos_designs_facts.py validate-modules:missing-gplv3-license
+plugins/modules/eos_designs_structured_config.py validate-modules:missing-gplv3-license
+plugins/modules/inventory_to_container.py validate-modules:missing-gplv3-license
+plugins/modules/set_vars.py validate-modules:missing-gplv3-license
+plugins/modules/verify_requirements.py validate-modules:missing-gplv3-license
+plugins/vars/global_vars.py validate-modules:missing-gplv3-license
+plugins/modules/eos_validate_state_runner.py validate-modules:missing-gplv3-license
+plugins/modules/eos_validate_state_reports.py validate-modules:missing-gplv3-license
+plugins/modules/cv_workflow.py validate-modules:missing-gplv3-license
+plugins/modules/eos_cli_config_gen.py validate-modules:missing-gplv3-license

python-avd/pyproject.toml

@@ -33,7 +33,7 @@ repository = "https://github.com/aristanetworks/avd"
 
 [dependency-groups]
 pytest = [
-    "ansible-core<2.18",
+    "ansible-core>=2.15.0,<2.19.0",
     "pytest",
     "pytest-asyncio",
     "PyYAML>=6.0.0",
@@ -46,7 +46,7 @@ coverage = [
 
 [project.optional-dependencies]
 ansible = [
-    "ansible-core>=2.15.0,<2.18.0",
+    "ansible-core>=2.15.0,<2.19.0",
     "pyavd[ansible-collection]",
 ]
 ansible-collection = [