From 65903d07e32ecd861f25de488a71f15ef764c877 Mon Sep 17 00:00:00 2001 From: Ajinkya Udgirkar Date: Mon, 10 Feb 2025 22:45:09 +0530 Subject: [PATCH] Upgraded ansible-lint upper bound to 25.1.2 (#327) * Upgraded ansible-lint upper bound to 25.1.2 Signed-off-by: Ajinkya Udgirkar * Fix failing test_ansiblelint_collection_role_errors tests Signed-off-by: Ajinkya Udgirkar --------- Signed-off-by: Ajinkya Udgirkar --- CHANGES/38371.feature | 1 + README.md | 2 +- setup.cfg | 2 +- tests/unit/test_loader_collection.py | 6 ++---- 4 files changed, 5 insertions(+), 6 deletions(-) create mode 100644 CHANGES/38371.feature diff --git a/CHANGES/38371.feature b/CHANGES/38371.feature new file mode 100644 index 00000000..967c2ba7 --- /dev/null +++ b/CHANGES/38371.feature @@ -0,0 +1 @@ +Upgraded the ansible-lint dependency upper bound from 24.9.0 to 25.1.2. \ No newline at end of file diff --git a/README.md b/README.md index 3cea53c5..a576b2d0 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ``galaxy-importer`` requires the following other Ansible projects: -* ``ansible-lint`` up to [24.9.0](https://github.com/ansible/ansible-lint/tree/v24.9.0/docs) +* ``ansible-lint`` up to [25.1.2](https://github.com/ansible/ansible-lint/tree/v25.1.2/docs) * ``ansible-core`` up to [2.16](https://docs.ansible.com/ansible-core/2.16/index.html) If you are installing from source, see ``setup.cfg`` in the repository for the matching requirements. diff --git a/setup.cfg b/setup.cfg index 6611f0ac..31439bdc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -19,7 +19,7 @@ packages = find: install_requires = ansible-core ansible-builder>=1.2.0,<4.0 - ansible-lint>=6.2.2,<=24.9.0 + ansible-lint>=6.2.2,<=25.1.2 attrs>=21.4.0,<23 nh3>=0.2.18,<3 # replaces bleach flake8>=5.0.0,<7 diff --git a/tests/unit/test_loader_collection.py b/tests/unit/test_loader_collection.py index f2822006..a369d801 100644 --- a/tests/unit/test_loader_collection.py +++ b/tests/unit/test_loader_collection.py @@ -631,10 +631,8 @@ def test_ansiblelint_collection_role_errors(populated_collection_root, tmp_colle collection_loader._lint_collection() shutil.rmtree(task_dir) - assert "name[casing]: All names should start with an uppercase letter." in str( - caplog.records[0] - ) - assert "jinja[spacing]: Jinja2 spacing could be improved:" in str(caplog.records[1]) + assert "All names should start with an uppercase letter." in str(caplog.records[0]) + assert "Jinja2 spacing could be improved:" in str(caplog.records[1]) def test_ansiblelint_collection_meta_runtime_errors(