Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / ansible-lint
Commits: 0116e132 by Robin Candau at 2024-05-15T20:29:36+02:00 upgpkg: 24.5.0-1: New upstream release https://github.com/ansible/ansible-lint/releases/tag/v24.5.0 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + ignore_yamllint_unknown_option.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,6 +1,6 @@ pkgbase = ansible-lint pkgdesc = Checks playbooks for practices and behaviour that could potentially be improved. - pkgver = 24.2.3 + pkgver = 24.5.0 pkgrel = 1 url = https://github.com/ansible/ansible-lint arch = any @@ -29,10 +29,13 @@ pkgbase = ansible-lint depends = python-rich depends = python-ruamel-yaml depends = python-wcmatch + depends = python-importlib-metadata optdepends = ansible: check official ansible collections - source = git+https://github.com/ansible/ansible-lint.git#tag=v24.2.3 + source = git+https://github.com/ansible/ansible-lint.git#tag=v24.5.0 source = disable_version_check.patch - b2sums = 76603d5154699a7fc545e455e7f0eb60ccaba8c1686bdfc9b8ed1b36438c6716b98a8154f06abe1183054db9c3b2dd7297acd443ef2e908815474de5d0f0fc60 + source = ignore_yamllint_unknown_option.patch + b2sums = 3ca439fe8d2526b6fa0718f1df2d9c640fc5913b4743dcfd0f922186c557325af05fa185bc677889319706f9f2986aa6472bfe182c1da060792ed76481a36de2 b2sums = 98294f267ca693c0bc3921f8e076d674a219a891502cd31a0af789bc0b1447b53834b9c85853a134f6bc1ac384f31cb174cba2d55fbcc1636cae9bd3c0bd8f84 + b2sums = 8e419c65642bdbd60aa81d1e204139e69fc4c86aaddde4131fbfe3c21f5751e608a5a635d3ec4f518d3d5dc9d254a84b302e09bb4f873e21628e2f014b151516 pkgname = ansible-lint ===================================== PKGBUILD ===================================== @@ -4,26 +4,30 @@ # Contributor: Sander Boom <sanderb...@gmail.com> pkgname=ansible-lint -pkgver=24.2.3 +pkgver=24.5.0 pkgrel=1 pkgdesc="Checks playbooks for practices and behaviour that could potentially be improved." arch=('any') url="https://github.com/ansible/ansible-lint" license=('GPL-3.0-or-later') depends=(python ansible-core git yamllint - python-{ansible-compat,black,enrich,filelock,jsonschema,pyaml,packaging,rich,ruamel-yaml,wcmatch}) + python-{ansible-compat,black,enrich,filelock,jsonschema,pyaml,packaging,rich,ruamel-yaml,wcmatch,importlib-metadata}) makedepends=(python-{build,installer,setuptools,setuptools-scm,wheel}) checkdepends=(mypy python-jmespath python-pylint python-pytest python-pytest-mock) optdepends=('ansible: check official ansible collections') source=(git+https://github.com/ansible/ansible-lint.git#tag=v$pkgver - disable_version_check.patch) -b2sums=('76603d5154699a7fc545e455e7f0eb60ccaba8c1686bdfc9b8ed1b36438c6716b98a8154f06abe1183054db9c3b2dd7297acd443ef2e908815474de5d0f0fc60' - '98294f267ca693c0bc3921f8e076d674a219a891502cd31a0af789bc0b1447b53834b9c85853a134f6bc1ac384f31cb174cba2d55fbcc1636cae9bd3c0bd8f84') + disable_version_check.patch + ignore_yamllint_unknown_option.patch) +b2sums=('3ca439fe8d2526b6fa0718f1df2d9c640fc5913b4743dcfd0f922186c557325af05fa185bc677889319706f9f2986aa6472bfe182c1da060792ed76481a36de2' + '98294f267ca693c0bc3921f8e076d674a219a891502cd31a0af789bc0b1447b53834b9c85853a134f6bc1ac384f31cb174cba2d55fbcc1636cae9bd3c0bd8f84' + '8e419c65642bdbd60aa81d1e204139e69fc4c86aaddde4131fbfe3c21f5751e608a5a635d3ec4f518d3d5dc9d254a84b302e09bb4f873e21628e2f014b151516') prepare() { cd ${pkgname} # stop ansible-lint from calling home every 24h to check for a new version - patch -Np1 < "${srcdir}"/disable_version_check.patch + patch -Np1 < "${srcdir}/disable_version_check.patch" + # remove yamllint 'forbid-duplicated-merge-keys' unknown rule/option (generates errors during tests) + patch -Np1 < "${srcdir}/ignore_yamllint_unknown_option.patch" } build() { @@ -54,6 +58,8 @@ check() { --deselect 'test/test_main.py::test_nodeps[1]' --deselect 'test/test_main.py::test_nodeps[2]' --deselect 'test/test_main.py::test_broken_ansible_cfg' + # ignore yamllint tests + --deselect 'test/test_yaml_utils.py::test_yamllint_incompatible_config' ) # install to temporary location, as importlib is used ===================================== ignore_yamllint_unknown_option.patch ===================================== @@ -0,0 +1,13 @@ +diff --git a/.yamllint b/.yamllint +index 472bb68..4f90867 100644 +--- a/.yamllint ++++ b/.yamllint +@@ -9,8 +9,6 @@ rules: + comments-indentation: false + document-start: + present: true +- key-duplicates: +- forbid-duplicated-merge-keys: true + indentation: + level: error + indent-sequences: consistent View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/ansible-lint/-/commit/0116e1324e68b97ec04381c718767a65a089bcff -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/ansible-lint/-/commit/0116e1324e68b97ec04381c718767a65a089bcff You're receiving this email because of your account on gitlab.archlinux.org.