Re: [PR PATCH] [Updated] pass-import: update to version 3.2

[adbrown101 <adbrown101@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1613 bytes --]

There is an updated pull request by adbrown101 against master on the void-packages repository

https://github.com/adbrown101/void-packages pass-import
https://github.com/void-linux/void-packages/pull/32091

pass-import: update to version 3.2
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ x] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/32091.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-32091.patch --]
[-- Type: text/x-diff, Size: 4423 bytes --]

From 083475115f98c6ff4e1a2ca26cb2a5905aa0d42b Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Fri, 12 Nov 2021 17:31:56 +0000
Subject: [PATCH 1/2] pass-import: update to version 3.2

added dependency

removed check and changed dependencies

pytest testing

Testing working

deselects in make_check_args

Checkdepends after make_check_args

Included updated version of pykeepass in pr
---
 srcpkgs/pass-import/template | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 3f24c84a8f82..a7aa58d65806 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,20 +1,15 @@
 # Template file for 'pass-import'
 pkgname=pass-import
-version=3.1
-revision=2
-build_style=gnu-makefile
-hostmakedepends="python3-setuptools python3-yaml"
-depends="pass>=1.7.0 python3-defusedxml python3-magic
- python3-cryptography python3-SecretStorage python3-pykeepass"
-checkdepends="pass python3-defusedxml python3-magic python3-cryptography
- python3-SecretStorage python3-pykeepass"
+version=3.2
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="pass python3-defusedxml python3-magic python3-cryptography python3-SecretStorage python3-pykeepass python3-yaml"
+make_check_args="--deselect=tests/imports/test_parse.py"
+checkdepends="python3-pytest $depends"
 short_desc="Pass extension for importing data from most existing password managers"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/roddhjav/pass-import"
 distfiles="https://github.com/roddhjav/pass-import/releases/download/v${version}/pass-import-${version}.tar.gz"
-checksum=659d2b503a18d57c9d63dee216d042d0e24f88576cdd0c7fc4b3426e40dbdbc2
-
-do_check() {
-	python3 setup.py test
-}
+checksum=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76

From 1bde668d2d5ec70a947193ca644c2ad2562b05bd Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 27 Jul 2021 17:53:25 +0100
Subject: [PATCH 2/2] python3-pykeepass: update to 4.0.1

Re-ordered depends

Wrap at 80

Changed distfiles

comment for deselecting test
---
 srcpkgs/pass-import/template       | 8 +++++---
 srcpkgs/python3-pykeepass/template | 8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index a7aa58d65806..49a1a710f924 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -3,11 +3,13 @@ pkgname=pass-import
 version=3.2
 revision=1
 build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="pass python3-defusedxml python3-magic python3-cryptography python3-SecretStorage python3-pykeepass python3-yaml"
+# This test requires gnome-keyring which requires running dbus
 make_check_args="--deselect=tests/imports/test_parse.py"
+hostmakedepends="python3-setuptools"
+depends="pass python3-defusedxml python3-magic python3-cryptography
+python3-SecretStorage python3-pykeepass python3-yaml"
 checkdepends="python3-pytest $depends"
-short_desc="Pass extension for importing data from most existing password managers"
+short_desc="Pass extension for importing data from most password managers"
 maintainer="Alan Brown <adbrown@rocketmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/roddhjav/pass-import"
diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index b7097bd99e87..532f3a77a13c 100644
--- a/srcpkgs/python3-pykeepass/template
+++ b/srcpkgs/python3-pykeepass/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pykeepass'
 pkgname=python3-pykeepass
-version=3.2.1
-revision=3
+version=4.0.1
+revision=1
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -13,5 +13,5 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/libkeepass/pykeepass"
 changelog="https://raw.githubusercontent.com/libkeepass/pykeepass/master/CHANGELOG.rst"
-distfiles="${PYPI_SITE}/p/pykeepass/pykeepass-${version}.tar.gz"
-checksum=b3e07eb2dd3aeb1dfa1a2d2d17be77066ee560c1e770f1c72d7ea5608117d284
+distfiles="https://github.com/libkeepass/pykeepass/archive/refs/tags/${version}.tar.gz"
+checksum=ac5966ede4fae1a0d3ea1997468a14b893a8f8dab136b1c14425b3b2763e68e3