git » namcap.git » commit d8f1013

diff --git a/PKGBUILD b/PKGBUILD
index 5e02ef7..4451d62 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,23 @@
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=namcap
-pkgver=3.2.10
-pkgrel=5
+pkgver=3.3.0
+pkgrel=1
 pkgdesc="A Pacman package analyzer"
 arch=('any')
 url='https://gitlab.archlinux.org/pacman/namcap'
 license=('GPL')
 depends=('python' 'pyalpm' 'licenses' 'binutils' 'elfutils' 'python-pyelftools')
-checkdepends=('systemd')
-makedepends=('python-setuptools')
-source=(https://sources.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        namcap-ignore-so-no-pie.patch
-        missing-desktop-file-utils.patch
-        py3.10.patch)
-sha512sums=('bdcca39cff873cc1ac7138bc2f218e808019424c1ff414b98f183400c08879a94fe7318049b1912dd094c1fced14b095a467465b04cd78cb9d1725cdbe2be821'
-            'df8a8c389aa9d619650d6e472409e4480095e09d5ea60b232a865e1a654dd9440e2228f1f098302b529d6db89f9cd0d8d066881da2bc3ca9ec07b17368efd2cf'
-            '74efb1939053f41129cd811cf84abef8ff84ca4673cb62c3115b9d56830a57a48fed021b9807a74299c4c4cf3ec1880733f91dd5d06f4b9ac294fc78a9b5498e'
-            '4fe74e35298313d7648fc0e9f74c2ddd4b2edd6a3a0a8c8c7ba9f6af9d2b32f555558e122c3f5bf5a98a65b8430f50593dfac689af7fbf34425032c6d925b0a4')
+checkdepends=('systemd' 'python-pytest' 'python-six')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+source=(https://gitlab.archlinux.org/pacman/namcap/-/archive/${pkgver}/namcap-${pkgver}.tar.bz2
+	missing-desktop-file-utils.patch)
+sha512sums=('2e7a12644b535307add7efa7909757470ee3bdb2bdb0171aa75acee9fe367cd0f368af06c4c61f1ddb5b3f6e628489a5a3a6a7d0659c70d6e16ef38c52a7f17e'
+            '74efb1939053f41129cd811cf84abef8ff84ca4673cb62c3115b9d56830a57a48fed021b9807a74299c4c4cf3ec1880733f91dd5d06f4b9ac294fc78a9b5498e')
 
 prepare() {
   cd ${pkgname}-${pkgver}
   patch -Np1 -i "${srcdir}/missing-desktop-file-utils.patch"
-  patch -Np1 -i "${srcdir}/namcap-ignore-so-no-pie.patch"
-  patch -Np1 -i "${srcdir}/py3.10.patch"
 }
 
 build() {
@@ -35,8 +29,8 @@ build() {
 check() {
   cd ${pkgname}-${pkgver}
   env PARSE_PKGBUILD_PATH="${srcdir}/${pkgname}-${pkgver}" \
-      PATH="${srcdir}/${pkgname}-${pkgver}:$PATH" \
-      python setup.py test
+      PATH="${srcdir}/${pkgname}-${pkgver}/scripts:$PATH" \
+      pytest
 }
 
 package() {
diff --git a/namcap-ignore-so-no-pie.patch b/namcap-ignore-so-no-pie.patch
deleted file mode 100644
index a7d7e38..0000000
--- a/namcap-ignore-so-no-pie.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 4ece4901d13b9fa590a538cc2133374d3c17df6f Mon Sep 17 00:00:00 2001
-From: Jelle van der Waa <jelle@vdwaa.nl>
-Date: Tue, 11 Sep 2018 18:21:39 +0200
-Subject: Ignore .so for no PIE check
-
-Signed-off-by: Kyle Keen <keenerd@gmail.com>
----
- Namcap/rules/elffiles.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Namcap/rules/elffiles.py b/Namcap/rules/elffiles.py
-index 6cef680..4ad1e66 100644
---- a/Namcap/rules/elffiles.py
-+++ b/Namcap/rules/elffiles.py
-@@ -228,6 +228,8 @@ class NoPIERule(TarballRule):
- 		for entry in tar:
- 			if not entry.isfile():
- 				continue
-+			if '.so' in entry.name:
-+				continue
- 			fp = tar.extractfile(entry)
- 			if not is_elf(fp):
- 				continue
--- 
-cgit v1.2.1-1-g437b
-
diff --git a/py3.10.patch b/py3.10.patch
deleted file mode 100644
index dcf85c3..0000000
--- a/py3.10.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 64e061c688d9f6d495c6d18cbd17baabda752ad6 Mon Sep 17 00:00:00 2001
-From: Leonidas Spyropoulos <artafinde@gmail.com>
-Date: Fri, 3 Dec 2021 14:06:58 +0000
-Subject: [PATCH] MutableMapping moved to collections.abc module
-
-https://docs.python.org/3.10/library/collections.abc.html
-Signed-off-by: Leonidas Spyropoulos <artafinde@gmail.com>
----
- Namcap/package.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Namcap/package.py b/Namcap/package.py
-index 2da5b1d..1cb026c 100644
---- a/Namcap/package.py
-+++ b/Namcap/package.py
-@@ -46,7 +46,7 @@ def strip_depend_info(value):
- 		raise ValueError("Invalid dependency specification")
- 	return m.group(1)
- 
--class PacmanPackage(collections.MutableMapping):
-+class PacmanPackage(collections.abc.MutableMapping):
- 	strings = ['base', 'name', 'version', 'desc', 'url', 'builddate',
- 			'packager', 'install', 'filename', 'csize', 'isize',
- 			'pkgfunction']
--- 
-GitLab
-