Date: Tuesday, February 9, 2021 @ 18:53:25 Author: freswa Revision: 851329
upgpkg: ansible-lint 5.0.0-1 Added: ansible-lint/trunk/disable_use_scm_version.patch Modified: ansible-lint/trunk/PKGBUILD -------------------------------+ PKGBUILD | 16 ++++++++++------ disable_use_scm_version.patch | 31 +++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-02-09 18:53:13 UTC (rev 851328) +++ PKGBUILD 2021-02-09 18:53:25 UTC (rev 851329) @@ -3,23 +3,27 @@ # Contributor: Sander Boom <[email protected]> pkgname=ansible-lint -pkgver=4.3.7 -pkgrel=5 +pkgver=5.0.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=('MIT') -depends=('python' 'ansible' 'python-ruamel-yaml' 'python-pyaml' 'python-rich' 'python-packaging') +depends=('python' 'ansible' 'python-ruamel-yaml' 'python-pyaml' 'python-rich' 'python-packaging' + 'python-wcmatch' 'python-enrich') makedepends=('git') checkdepends=('python-pytest') -source=(https://github.com/ansible/ansible-lint/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz) -sha256sums=('a20e49e3b50130d1c3baa46db0e926ebfd6616cb99dd920952cb1481e7b267b3') +optdepends=('yamllint: check for yaml syntax mistakes') +source=(https://github.com/ansible/ansible-lint/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz + disable_use_scm_version.patch) +b2sums=('b473196f5f6ebd32069c0ae11c1fecbb54c5b50811dfc1ca5e74ee9a9c084f66b2799e8a4436118eb0ab65847e77888faa58f87b6c2e399e25101dbc3b2cdd2c' + 'a090862e657bfc29c89b23b2ecc8c585e15f098310b997e39600b6bdf0cd433e1045e2da348ce27dc2d3c0f9ef01950cf0ec5e7b071bc43d85161faabd8a1f60') prepare() { cd ${pkgname}-${pkgver} # stop setuptools from using the scm version which doesn't exist in this context + patch -Np1 < "${srcdir}"/disable_use_scm_version.patch sed -i "/^\[metadata\]/a version = ${pkgver}" setup.cfg - sed -i 's/use_scm_version/#use_scm_version/' setup.cfg } build() { Added: disable_use_scm_version.patch =================================================================== --- disable_use_scm_version.patch (rev 0) +++ disable_use_scm_version.patch 2021-02-09 18:53:25 UTC (rev 851329) @@ -0,0 +1,31 @@ +diff -aur origsrc/ansible-lint-5.0.0/setup.cfg src/ansible-lint-5.0.0/setup.cfg +--- aaa/setup.cfg 2021-02-09 19:19:11.689518714 +0100 ++++ bbb/setup.cfg 2021-02-09 19:19:30.538804812 +0100 +@@ -54,18 +54,12 @@ + lint + + [options] +-use_scm_version = True + python_requires = >=3.6 + package_dir = + = src + packages = find: + zip_safe = False + +-# These are required during `setup.py` run: +-setup_requires = +- setuptools_scm>=1.15.0 +- setuptools_scm_git_archive>=1.0 +- + # These are required in actual runtime: + install_requires = + # ansible-lint does not list ansible as direct dependency in order to +diff -aur origsrc/ansible-lint-5.0.0/setup.py src/ansible-lint-5.0.0/setup.py +--- aaa/setup.py 2021-02-09 19:19:11.689518714 +0100 ++++ bbb/setup.py 2021-02-09 19:19:42.271693765 +0100 +@@ -9,5 +9,4 @@ + # https://github.com/jazzband/pip-tools/issues/1278 + setuptools.setup( + use_scm_version={"local_scheme": "no-local-version"}, +- setup_requires=["setuptools_scm[toml]>=3.5.0"], + )
