[arch-commits] Commit in ansible-lint/trunk (PKGBUILD disable_use_scm_version.patch)

[Frederik Schwan]

    Date: Tuesday, December 7, 2021 @ 12:47:33
  Author: freswa
Revision: 1065521

upgpkg: ansible-lint 5.3.0-1

Modified:
  ansible-lint/trunk/PKGBUILD
  ansible-lint/trunk/disable_use_scm_version.patch

-------------------------------+
 PKGBUILD                      |   15 +++++++-------
 disable_use_scm_version.patch |   42 +++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 31 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-07 12:44:44 UTC (rev 1065520)
+++ PKGBUILD	2021-12-07 12:47:33 UTC (rev 1065521)
@@ -3,8 +3,8 @@
 # Contributor: Sander Boom <sanderboom at gmail.com>
 
 pkgname=ansible-lint
-pkgver=5.2.1
-pkgrel=3
+pkgver=5.3.0
+pkgrel=1
 pkgdesc="Checks playbooks for practices and behaviour that could potentially be improved."
 arch=('any')
 url="https://github.com/ansible/ansible-lint"
@@ -11,13 +11,13 @@
 license=('MIT')
 depends=('python' 'ansible-core' 'python-ruamel-yaml' 'python-pyaml' 'python-rich' 'python-packaging'
           'python-wcmatch' 'python-enrich' 'python-tenacity')
-checkdepends=('python-pytest')
+makedepends=('python-build' 'python-install' 'python-wheel')
 optdepends=('yamllint: check for yaml syntax mistakes'
             'ansible: check official ansible collections')
 source=(https://github.com/ansible/ansible-lint/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz
         disable_use_scm_version.patch)
-b2sums=('52788dc9f4b2fe62cf02d8341bc6786644d369a31ddd4c4143dc275db10610d676c8b3fca5c790a4a7471bcfc2e45850ce03f6433ab3810e4a9aa5daeb5f162a'
-        'a090862e657bfc29c89b23b2ecc8c585e15f098310b997e39600b6bdf0cd433e1045e2da348ce27dc2d3c0f9ef01950cf0ec5e7b071bc43d85161faabd8a1f60')
+b2sums=('17f4699ef68d24bad65b8ce33272cc1fe7d28416baac55d521080b2a89a7cad5dce5ece53c24447014fb3f7a80bff107398c7d8015f166cabca2d0010506b3f0'
+        '41a9f052e1a8cca7f720da3dd4ba7ccbbd7d0046bdb7008c58172ba388f798a4bca5faea15df3e9dc0f022b8c91354ff64595850dfeea47a40cfe2182beec072')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -28,11 +28,12 @@
 
 build() {
   cd ${pkgname}-${pkgver}
-  python setup.py build
+  python -m build --wheel --skip-dependency-check --no-isolation
 }
 
 package() {
   cd ${pkgname}-${pkgver}
-  python setup.py install --root="${pkgdir}" --optimize=1
+  python -m install --optimize=1 --destdir="${pkgdir}" dist/*.whl
+  chmod +x "${pkgdir}"/usr/bin/*
   install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
 }

Modified: disable_use_scm_version.patch
===================================================================
--- disable_use_scm_version.patch	2021-12-07 12:44:44 UTC (rev 1065520)
+++ disable_use_scm_version.patch	2021-12-07 12:47:33 UTC (rev 1065521)
@@ -1,7 +1,21 @@
-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 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 0292abc..08c78d6 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 135404d..9ccd41b 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -56,7 +56,6 @@ keywords =
    lint
  
  [options]
@@ -9,23 +23,3 @@
  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"],
- )