Date: Wednesday, December 14, 2022 @ 21:17:40 Author: freswa Revision: 1359187
upgpkg: ansible-lint 6.10.0-1 Modified: ansible-lint/trunk/PKGBUILD Deleted: ansible-lint/trunk/disable_use_scm_version.patch -------------------------------+ PKGBUILD | 13 +++++-------- disable_use_scm_version.patch | 25 ------------------------- 2 files changed, 5 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-14 20:58:17 UTC (rev 1359186) +++ PKGBUILD 2022-12-14 21:17:40 UTC (rev 1359187) @@ -3,8 +3,8 @@ # Contributor: Sander Boom <[email protected]> pkgname=ansible-lint -pkgver=6.9.1 -pkgrel=2 +pkgver=6.10.0 +pkgrel=1 pkgdesc="Checks playbooks for practices and behaviour that could potentially be improved." arch=('any') url="https://github.com/ansible/ansible-lint"; @@ -14,19 +14,16 @@ makedepends=(python-{build,installer,setuptools,wheel}) optdepends=('ansible: check official ansible collections') source=(https://github.com/ansible/ansible-lint/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz - disable_use_scm_version.patch disable_version_check.patch) -b2sums=('73035bdbd6c1bdee5566d5dee5a8461953d99bbaf896d7a9764c32419e74c3d23883ac1a7548de3e21372195f99c325c371cead7397bf64d6d033d9a2f81ed01' - 'cf911567b040c8938ca589fde3c93b39cfba29ca1a373b8af354450a4f880d475463b0c81440fb9bfacc7b1f93736a5ae5ab58c7fdb30d8f03d1996754a738f3' +b2sums=('1277398c93e26110babe4f0ef7ef94c39aacf3cd0fc14c609e12d3db88516da723756b42bb2164224bea58df457062748fb195116dc910e1c3fa57d664077272' '09a8a69cd2953e6f0b813976fae31388db87647e80ef7942a960adf1cf71e6a843ed86a2456e718042c790a8481db3bb2f7092c52c9553950cc05f46fe7ee35f') 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 # stop ansible-lint from calling home every 24h to check for a new version patch -Np1 < "${srcdir}"/disable_version_check.patch - sed -i "/^\[metadata\]/a version = ${pkgver}" setup.cfg + # use pkg version + sed -i "s/dynamic = \[\"version\"\]/version = \"${pkgver}\"/" pyproject.toml } build() { Deleted: disable_use_scm_version.patch =================================================================== --- disable_use_scm_version.patch 2022-12-14 20:58:17 UTC (rev 1359186) +++ disable_use_scm_version.patch 2022-12-14 21:17:40 UTC (rev 1359187) @@ -1,25 +0,0 @@ -diff --git a/pyproject.toml b/pyproject.toml -index 89592b8..abffa79 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,8 +1,6 @@ - [build-system] - requires = [ - "setuptools >= 42.0.0", # required by pyproject+setuptools_scm integration -- "setuptools_scm[toml] >= 3.5.0", # required for "no-local-version" scheme -- "setuptools_scm_git_archive >= 1.0", - "wheel", - ] - build-backend = "setuptools.build_meta" -diff --git a/setup.cfg b/setup.cfg -index 5301b4f..5aa5d1e 100644 ---- a/setup.cfg -+++ b/setup.cfg -@@ -54,7 +54,6 @@ keywords = - lint - - [options] --use_scm_version = True - python_requires = >=3.8 - package_dir = - = src
