From c4286d0922351f9bf1287e2e92e92398620d62cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 08:29:07 +0000 Subject: [PATCH 1/6] Bump(requirements): Update ansible-core requirement Updates the requirements on [ansible-core](https://github.com/ansible/ansible) to permit the latest version. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](https://github.com/ansible/ansible/compare/v2.15.0...v2.18.0) --- updated-dependencies: - dependency-name: ansible-core dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- ansible_collections/arista/avd/requirements-dev.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/avd/requirements-dev.txt b/ansible_collections/arista/avd/requirements-dev.txt index 97d983386d3..6cc50b11c81 100644 --- a/ansible_collections/arista/avd/requirements-dev.txt +++ b/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 From d2b279e489d2c3f71c0b91ca0af2ba0f046cad21 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Wed, 13 Nov 2024 07:11:20 +0100 Subject: [PATCH 2/6] Update pull-request-management.yml --- .github/workflows/pull-request-management.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request-management.yml b/.github/workflows/pull-request-management.yml index 7738c5a8468..686a4fbcfa2 100644 --- a/.github/workflows/pull-request-management.yml +++ b/.github/workflows/pull-request-management.yml @@ -127,7 +127,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' @@ -166,7 +166,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: @@ -233,6 +233,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: @@ -274,7 +277,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' @@ -314,7 +317,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' @@ -362,7 +365,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/ @@ -384,7 +387,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/ @@ -407,7 +410,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/ @@ -456,7 +459,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 From e9e0007e6ab1aef3dfa38c344b40ef366c042da7 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Wed, 13 Nov 2024 07:22:44 +0100 Subject: [PATCH 3/6] Update runtime.yml --- ansible_collections/arista/avd/meta/runtime.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/avd/meta/runtime.yml b/ansible_collections/arista/avd/meta/runtime.yml index 9ddac290331..09fc7ba18f7 100644 --- a/ansible_collections/arista/avd/meta/runtime.yml +++ b/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: From 203fa31f7adc11262f240c779b644742c1be8ed9 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Wed, 13 Nov 2024 07:24:50 +0100 Subject: [PATCH 4/6] Update pyproject.toml --- python-avd/pyproject.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python-avd/pyproject.toml b/python-avd/pyproject.toml index 0d5dbe3f6dc..4c7397b0a0c 100644 --- a/python-avd/pyproject.toml +++ b/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 = [ From a38732a3403566105d93d3363b83a808401edd4b Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Wed, 13 Nov 2024 07:32:04 +0100 Subject: [PATCH 5/6] Add ansible-test sanity ignore file for 2.18 --- .../arista/avd/tests/sanity/ignore-2.18.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 ansible_collections/arista/avd/tests/sanity/ignore-2.18.txt diff --git a/ansible_collections/arista/avd/tests/sanity/ignore-2.18.txt b/ansible_collections/arista/avd/tests/sanity/ignore-2.18.txt new file mode 100644 index 00000000000..71bde4726e7 --- /dev/null +++ b/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 From 1716458a0f83ecf60ccc81a28ece1496e0567b81 Mon Sep 17 00:00:00 2001 From: Claus Holbech Date: Wed, 13 Nov 2024 11:01:02 +0000 Subject: [PATCH 6/6] fix inventory_to_container --- .../arista/avd/plugins/modules/inventory_to_container.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible_collections/arista/avd/plugins/modules/inventory_to_container.py b/ansible_collections/arista/avd/plugins/modules/inventory_to_container.py index 55c8c3cb005..d7defeb515c 100644 --- a/ansible_collections/arista/avd/plugins/modules/inventory_to_container.py +++ b/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""" ---