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

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

[adbrown101]

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

There is a new 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: 1117 bytes --]

From 9c04973c11dcdeaca1a322801c05e02b98a2ad38 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
Subject: [PATCH] pass-import: update to version 3.2

---
 srcpkgs/pass-import/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..e6de6aa3646e 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,6 +1,6 @@
 # Template file for 'pass-import'
 pkgname=pass-import
-version=3.1
+version=3.2
 revision=1
 build_style=gnu-makefile
 hostmakedepends="python3-setuptools python3-yaml"
@@ -13,7 +13,7 @@ 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
+checksum=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
 
 do_check() {
 	python3 setup.py test

Re: pass-import: update to version 3.2

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-884435854

Comment:
See https://github.com/roddhjav/pass-import/blob/master/setup.py#L70, it's missing a dependency.

And please remove duplicates from `checkdepends` by adding `$depends` to it.

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

[adbrown101]

[-- 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: 1657 bytes --]

From 19ba7296e9f233ebcb0315d381fcba4d1cc6e33a Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
Subject: [PATCH] pass-import: update to version 3.2

added dependency

removed check and changed dependencies
---
 srcpkgs/pass-import/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..8d20aeb84739 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,20 +1,13 @@
 # Template file for 'pass-import'
 pkgname=pass-import
-version=3.1
+version=3.2
 revision=1
 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"
+hostmakedepends="python3-setuptools"
+depends="pass python3-defusedxml python3-magic python3-cryptography python3-SecretStorage python3-pykeepass python3-yaml"
 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

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-885240172

Comment:
Changed the dependencies and done a clean build on my machine.

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

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r675261200

Comment:
Why do you remove check?

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

[adbrown101]

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

New review comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r675966168

Comment:
Mainly, because I cannot get `./xbps-src check pass-import` to work on my machine. I have tried with `python3-pytest` and it suggests that there is a problem with `python3-keepass`. I can do some more tests, but as it is optional I removed it.

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r675980072

Comment:
That might be because we have old version of python3-keepass in the repositories, try updating it and see if it helps. Also make sure the tests are ran with pytest, you can then deselect failing tests with `--deselect path/to/failing/test.py`. See for example the [flake8 template](https://github.com/void-linux/void-packages/blob/80b41e8fc25910b0d1daa9c0849a698a3cd516ac/srcpkgs/flake8/template).

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

[adbrown101]

[-- 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: 3193 bytes --]

From 19ba7296e9f233ebcb0315d381fcba4d1cc6e33a Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
Subject: [PATCH 1/2] pass-import: update to version 3.2

added dependency

removed check and changed dependencies
---
 srcpkgs/pass-import/template | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..8d20aeb84739 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,20 +1,13 @@
 # Template file for 'pass-import'
 pkgname=pass-import
-version=3.1
+version=3.2
 revision=1
 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"
+hostmakedepends="python3-setuptools"
+depends="pass python3-defusedxml python3-magic python3-cryptography python3-SecretStorage python3-pykeepass python3-yaml"
 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 2c6ae96a8710ed13c0320fb73a27f7c4d9221740 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Sun, 25 Jul 2021 11:20:48 +0100
Subject: [PATCH 2/2] pytest testing

---
 srcpkgs/pass-import/template | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 8d20aeb84739..d096daf208a6 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -2,12 +2,27 @@
 pkgname=pass-import
 version=3.2
 revision=1
-build_style=gnu-makefile
+build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="pass python3-defusedxml python3-magic python3-cryptography python3-SecretStorage python3-pykeepass python3-yaml"
+checkdepends="python3-pytest python3-devel $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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+
+do_check() {
+
+	# Must export PYTHONPATH so subprocesses see the variable
+	local _pypath="${PYTHONPATH}"
+	export PYTHONPATH="${PWD}/src:${PYTHONPATH}"
+	python3 -m pytest --ignore=tests/test_macosx_libfile.py
+
+	if [ -n "${_pypath}" ]; then
+		export PYTHONPATH="${_pypath}"
+	else
+		unset PYTHONPATH
+	fi
+}

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

[adbrown101]

[-- 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: 1912 bytes --]

From c5d20a34ce0bc1ebc4c368d8a359f7298c6d3102 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
Subject: [PATCH] pass-import: update to version 3.2

added dependency

removed check and changed dependencies

pytest testing

Testing working
---
 srcpkgs/pass-import/template | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..bd0fc810a2c9 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,20 +1,22 @@
 # Template file for 'pass-import'
 pkgname=pass-import
-version=3.1
+version=3.2
 revision=1
-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"
+build_style=python3-module
+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"
 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
+checksum=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
 
 do_check() {
-	python3 setup.py test
+	# from flake8
+	PYTHONPATH=build/lib python3 -m pytest \
+		--deselect=tests/exports/test_keepass.py \
+		--deselect=tests/imports/test_parse.py
+
 }

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

[adbrown101]

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

New review comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r676163752

Comment:
Have a new pytest check which works. You are right about python3-keepass. I will submit a separate PR to update this, then I will change the test.

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-886226100

Comment:
if newer python3-keepass fixes tests here, it should be included in this PR, because test failures indicate that it doesn't really work with the older version

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r676170543

Comment:
you don't need to include the from flake8 comment. Would adding deselects to make_check_args and dropping do_check work?

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

[adbrown101]

[-- 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: 1891 bytes --]

From b06b94fcb151eace3fcb42556d4f3f74296b80ef Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
Subject: [PATCH] pass-import: update to version 3.2

added dependency

removed check and changed dependencies

pytest testing

Testing working

deselects in make_check_args
---
 srcpkgs/pass-import/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..3b5faf95b420 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
+version=3.2
 revision=1
-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"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="pass python3-defusedxml python3-magic python3-cryptography python3-SecretStorage python3-pykeepass python3-yaml"
+checkdepends="python3-pytest $depends"
+make_check_args="--deselect=tests/exports/test_keepass.py --deselect=tests/imports/test_parse.py"
 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

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

[adbrown101]

[-- 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: 1927 bytes --]

From d4db694b89fee4477960c87f0e20334dd2378e0b Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
Subject: [PATCH] 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
---
 srcpkgs/pass-import/template | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..3bafeb39479c 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
+version=3.2
 revision=1
-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"
+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/exports/test_keepass.py --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

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

[adbrown101]

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

New review comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r676787208

Comment:
Yes done this and it builds / checks for me

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-886876025

Comment:
I did think of including an update to `python3-pykeepass` into this pr but I thought it would be more simple to make the check work with the old version as it builds OK then update later. I have noticed all the automatic checks have failed. Would rebasing this branch against a newer version of master help?

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-886919583

Comment:
> I did think of including an update to `python3-pykeepass` into this pr but I thought it would be more simple to make the check work with the old version as it builds OK then update later.

you are not making check work with the old version you are ignoring the keepass part of the checks, because they fail. This is suspicious, especially if newer pykeepass fixes it.

The current pass-import version in the repositories (before this PR) doesn't work with pykeepass 4 and it sounds like pass-import 3.2 doesn't work with the older version either, so both packages should be in the same PR to avoid merging one before the other and breaking pass-import until the other PR is merged.

> I have noticed all the automatic checks have failed. Would rebasing this branch against a newer version of master help?

yes, a rebase on top of master will fix it

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r676836244

Comment:
can you add a comment why the parse test is disabled? (the test uses gnome keyring which needs running dbus)

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-886923010

Comment:
Also it might be nice to check if upstream documents the requirement of pykeepass 4.0 and if not, notify them about it. It's possible that they are unknowingly using functionality only in 4.0 while also thinking they support v3.

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-886923010

Comment:
Also it might be nice to check if upstream documents the requirement of pykeepass 4.0 and if not, notify them about it. It's possible that they are unknowingly using functionality only in 4.0 while thinking they also support v3.

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

[adbrown101]

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

New review comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r677404831

Comment:
Haven't explored this except that this test fails

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-887475445

Comment:
> The current pass-import version in the repositories (before this PR) doesn't work with pykeepass 4 and it sounds like pass-import 3.2 doesn't work with the older version either, so both packages should be in the same PR to avoid merging one before the other and breaking pass-import until the other PR is merged.
Should I cancel the pykeepass pr and add it to this branch, or has your linking of the 2 issues done that anyway?

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-887475445

Comment:
> The current pass-import version in the repositories (before this PR) doesn't work with pykeepass 4 and it sounds like pass-import 3.2 doesn't work with the older version either, so both packages should be in the same PR to avoid merging one before the other and breaking pass-import until the other PR is merged.

Should I cancel the pykeepass pr and add it to this branch, or has your linking of the 2 issues done that anyway?

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-887478176

Comment:
> > The current pass-import version in the repositories (before this PR) doesn't work with pykeepass 4 and it sounds like pass-import 3.2 doesn't work with the older version either, so both packages should be in the same PR to avoid merging one before the other and breaking pass-import until the other PR is merged.
> 
> Should I cancel the pykeepass pr and add it to this branch, or has your linking of the 2 issues done that anyway?
> 

Close it with a comment describing why it was closed and move the commit here. 

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

[adbrown101]

[-- 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: 3089 bytes --]

From 144ff96c13717ac455946c613183ddbdfd85dfee Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
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 | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..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
+version=3.2
 revision=1
-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"
+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 e1c50c99e0f788c461f13b9a45916e5ae71114c4 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

---
 srcpkgs/python3-pykeepass/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index dc3fe59fa411..c93244745238 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=2
+version=4.0.1
+revision=1
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ 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
+checksum=eaa2a016c15a81beb6e253a8cb1fe64738b5fb4a28389dcdba621ea538dd814b

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

[adbrown101]

[-- 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: 3876 bytes --]

From 144ff96c13717ac455946c613183ddbdfd85dfee Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Wed, 21 Jul 2021 13:38:48 +0100
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 | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 73a2fca03041..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
+version=3.2
 revision=1
-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"
+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 dc5246c319725a85e2ab326a30ccc9424c49c1e6 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
---
 srcpkgs/pass-import/template       | 2 +-
 srcpkgs/python3-pykeepass/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index a7aa58d65806..26be3e47868a 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -3,9 +3,9 @@ pkgname=pass-import
 version=3.2
 revision=1
 build_style=python3-module
+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"
-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>"
diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index dc3fe59fa411..c93244745238 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=2
+version=4.0.1
+revision=1
 wrksrc="pykeepass-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
@@ -14,4 +14,4 @@ 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
+checksum=eaa2a016c15a81beb6e253a8cb1fe64738b5fb4a28389dcdba621ea538dd814b

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-887718348

Comment:
Can you check if other packages which depend on pykeepass work with v4?

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-888465276

Comment:
Just checking with gnome-passwordsafe. It looks like their master branch has updated to 4.0.1, but 5.0 is on 3.2.1

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-888589978

Comment:
> Just checking with gnome-passwordsafe. It looks like their master branch has updated to 4.0.1, but 5.0 is on 3.2.1

That's unfortunate. Let's keep an eye on releases and wait with this PR.

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-964662895

Comment:
Fedora has been using pykeepass 4.0 with passwordsafe in 34, so we can safely move with this PR now, could you rebase on master?

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-966247268

Comment:
 Will look at this weekend
    On Wednesday, 10 November 2021, 00:20:01 GMT, Michal Vasilek ***@***.***> wrote:  
 
 


Fedora has been using pykeepass 4.0 with passwordsafe in 34, so we can safely move with this PR now, could you rebase on master?

—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub, or unsubscribe.
Triage notifications on the go with GitHub Mobile for iOS or Android.
  

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

[adbrown101]

[-- 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: 3890 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 476c3e3c807bd5b345bdd14a9f5f991e44509f21 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
---
 srcpkgs/pass-import/template       | 2 +-
 srcpkgs/python3-pykeepass/template | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index a7aa58d65806..26be3e47868a 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -3,9 +3,9 @@ pkgname=pass-import
 version=3.2
 revision=1
 build_style=python3-module
+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"
-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>"
diff --git a/srcpkgs/python3-pykeepass/template b/srcpkgs/python3-pykeepass/template
index b7097bd99e87..c93244745238 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"
@@ -14,4 +14,4 @@ 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
+checksum=eaa2a016c15a81beb6e253a8cb1fe64738b5fb4a28389dcdba621ea538dd814b

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r748490643

Comment:
wrap at 80 columns

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r748494886

Comment:
Switch to the github tarball so the tests can run

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

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#discussion_r748492315

Comment:
could you add a comment why this is necessary?

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

[adbrown101]

[-- 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

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-968059345

Comment:
Changes made. Hope the squashes don't make it too complicated.

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

[adbrown101]

[-- 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: 3180 bytes --]

From 944b65e7ef2e7ef8c469284d4c75580697e91658 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Sat, 13 Nov 2021 15:03:26 +0000
Subject: [PATCH 1/2] pass-import: update to 3.2

---
 srcpkgs/pass-import/template | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 3f24c84a8f82..49a1a710f924 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,20 +1,17 @@
 # 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"
-short_desc="Pass extension for importing data from most existing password managers"
+version=3.2
+revision=1
+build_style=python3-module
+# 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 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 e7ec3070035eb39b229e4aea5453ab9dd8178995 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Sat, 13 Nov 2021 15:04:40 +0000
Subject: [PATCH 2/2] python3-pykeepass: update to 4.0.1

---
 srcpkgs/python3-pykeepass/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

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

[paper42]

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

There's a merged pull request on the void-packages repository

pass-import: update to version 3.2
https://github.com/void-linux/void-packages/pull/32091

Description:
<!-- 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
-->

Re: pass-import: update to version 3.2

[adbrown101]

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

New comment by adbrown101 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-970257590

Comment:
Thanks for all of the help with this update

Re: pass-import: update to version 3.2

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32091#issuecomment-970285228

Comment:
> Thanks for all of the help with this update

Thank you for the update