* [PR PATCH] pass-import: update to 3.3.
@ 2022-11-27 14:15 adbrown101
2022-11-27 15:52 ` [PR REVIEW] " sgn
` (15 more replies)
0 siblings, 16 replies; 17+ messages in thread
From: adbrown101 @ 2022-11-27 14:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1110 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/40801
pass-import: update to 3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
A patch file from https://github.com/void-linux/void-packages/pull/40801.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-40801.patch --]
[-- Type: text/x-diff, Size: 1628 bytes --]
From 10940a1ac00b26dd806eb1ab39abe24886576a0d Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 15 Nov 2022 18:27:00 +0000
Subject: [PATCH] pass-import: update to 3.3.
---
srcpkgs/pass-import/template | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 05b93ebdd1b0..9a0c1716e8f6 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,17 +1,18 @@
# Template file for 'pass-import'
pkgname=pass-import
-version=3.2
-revision=2
+version=3.3
+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"
+hostmakedepends="python3-setuptools python3-pypandoc python3-requests python3-yaml
+ python3-zxcvbn"
depends="pass python3-defusedxml python3-magic python3-cryptography
-python3-SecretStorage python3-pykeepass python3-yaml"
+python3-SecretStorage python3-pykeepass python3-requests python3-yaml lastpass-cli python3-zxcvbn"
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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+checksum=f368451a559d5aebd74a03b26d902cc8b6339f2eacb31777b3c2c24ae7b6444c
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
@ 2022-11-27 15:52 ` sgn
2022-11-27 15:55 ` sgn
` (14 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2022-11-27 15:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1032953957
Comment:
Please switch `distfiles` to `PYPI_SITE` https://pypi.org/project/pass-import/#files, `pypandoc` is not very welcome in hostmakedepends
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
2022-11-27 15:52 ` [PR REVIEW] " sgn
@ 2022-11-27 15:55 ` sgn
2022-11-29 12:40 ` adbrown101
` (13 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2022-11-27 15:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1032954472
Comment:
https://github.com/roddhjav/pass-import/issues/192
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
2022-11-27 15:52 ` [PR REVIEW] " sgn
2022-11-27 15:55 ` sgn
@ 2022-11-29 12:40 ` adbrown101
2022-11-30 20:00 ` [PR PATCH] [Updated] " adbrown101
` (12 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-11-29 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New review comment by adbrown101 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1034703201
Comment:
Yes will do this evening
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (2 preceding siblings ...)
2022-11-29 12:40 ` adbrown101
@ 2022-11-30 20:00 ` adbrown101
2022-11-30 20:03 ` [PR REVIEW] " adbrown101
` (11 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-11-30 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 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/40801
pass-import: update to 3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
A patch file from https://github.com/void-linux/void-packages/pull/40801.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-40801.patch --]
[-- Type: text/x-diff, Size: 2945 bytes --]
From d52dbd88a0464fa89981837440758c5b4577d153 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 15 Nov 2022 18:27:00 +0000
Subject: [PATCH] pass-import: update to 3.3.
---
srcpkgs/pass-import/patches/makedoc.patch | 32 +++++++++++++++++++++++
srcpkgs/pass-import/template | 13 ++++-----
2 files changed, 39 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/pass-import/patches/makedoc.patch
diff --git a/srcpkgs/pass-import/patches/makedoc.patch b/srcpkgs/pass-import/patches/makedoc.patch
new file mode 100644
index 000000000000..7fe5175fb2e3
--- /dev/null
+++ b/srcpkgs/pass-import/patches/makedoc.patch
@@ -0,0 +1,32 @@
+--- a/setup.py
++++ b/setup.py
+@@ -5,29 +5,11 @@
+ import os
+ import sys
+
+-try:
+- import pypandoc
+- PANDOC = True
+-except ImportError:
+- PANDOC = False
+ from pathlib import Path
+
+-from share import makedoc
+ from setuptools import setup
+
+
+-makedoc()
+-if not PANDOC:
+- print("Warning: 'pypandoc' is required to generate the manual pages.")
+-else:
+- try:
+- for name in ['pass-import', 'pimport']:
+- pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
+- outputfile=f"share/man/man1/{name}.1",
+- extra_args=['--standalone'])
+- except OSError:
+- print("Warning: 'pandoc' is not installed.")
+-
+
+ share = Path(sys.prefix, 'share')
+ base = '/usr'
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 05b93ebdd1b0..1b7a57538de1 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,17 +1,18 @@
# Template file for 'pass-import'
pkgname=pass-import
-version=3.2
-revision=2
+version=3.3
+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"
+hostmakedepends="python3-setuptools python3-requests python3-yaml python3-zxcvbn"
depends="pass python3-defusedxml python3-magic python3-cryptography
-python3-SecretStorage python3-pykeepass python3-yaml"
+python3-SecretStorage python3-pykeepass python3-requests python3-yaml lastpass-cli python3-zxcvbn"
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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+distfiles="${PYPI_SITE}/p/pass-import/pass-import-${version}.tar.gz"
+# distfiles="https://files.pythonhosted.org/packages/source/p/pass-import/pass-import-3.3.tar.gz"
+checksum=f4cc7c5bb493d3e8936fa6a7cc4b744d6851a0cfb51dc20b2d1d0a6c1e9f3e9c
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (3 preceding siblings ...)
2022-11-30 20:00 ` [PR PATCH] [Updated] " adbrown101
@ 2022-11-30 20:03 ` adbrown101
2022-11-30 20:21 ` paper42
` (10 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-11-30 20:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by adbrown101 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1036395242
Comment:
Changed to PYPI_SITE and removed the makedoc from setup.py. There are no tests in these sources, so do I drop the checkdepends altogether?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (4 preceding siblings ...)
2022-11-30 20:03 ` [PR REVIEW] " adbrown101
@ 2022-11-30 20:21 ` paper42
2022-12-01 19:44 ` [PR PATCH] [Updated] " adbrown101
` (9 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-11-30 20:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1036408902
Comment:
why is this comment here?
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (5 preceding siblings ...)
2022-11-30 20:21 ` paper42
@ 2022-12-01 19:44 ` adbrown101
2022-12-01 19:47 ` [PR REVIEW] " adbrown101
` (8 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-12-01 19:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 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/40801
pass-import: update to 3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
A patch file from https://github.com/void-linux/void-packages/pull/40801.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-40801.patch --]
[-- Type: text/x-diff, Size: 2872 bytes --]
From 8711b93817b0aea7479428288fdbead792c90fe1 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 15 Nov 2022 18:27:00 +0000
Subject: [PATCH] pass-import: update to 3.3.
---
srcpkgs/pass-import/patches/makedoc.patch | 32 +++++++++++++++++++++++
srcpkgs/pass-import/template | 14 +++++-----
2 files changed, 39 insertions(+), 7 deletions(-)
create mode 100644 srcpkgs/pass-import/patches/makedoc.patch
diff --git a/srcpkgs/pass-import/patches/makedoc.patch b/srcpkgs/pass-import/patches/makedoc.patch
new file mode 100644
index 000000000000..7fe5175fb2e3
--- /dev/null
+++ b/srcpkgs/pass-import/patches/makedoc.patch
@@ -0,0 +1,32 @@
+--- a/setup.py
++++ b/setup.py
+@@ -5,29 +5,11 @@
+ import os
+ import sys
+
+-try:
+- import pypandoc
+- PANDOC = True
+-except ImportError:
+- PANDOC = False
+ from pathlib import Path
+
+-from share import makedoc
+ from setuptools import setup
+
+
+-makedoc()
+-if not PANDOC:
+- print("Warning: 'pypandoc' is required to generate the manual pages.")
+-else:
+- try:
+- for name in ['pass-import', 'pimport']:
+- pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
+- outputfile=f"share/man/man1/{name}.1",
+- extra_args=['--standalone'])
+- except OSError:
+- print("Warning: 'pandoc' is not installed.")
+-
+
+ share = Path(sys.prefix, 'share')
+ base = '/usr'
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 05b93ebdd1b0..ff26011f6c55 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,17 +1,17 @@
# Template file for 'pass-import'
pkgname=pass-import
-version=3.2
-revision=2
+version=3.3
+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"
+hostmakedepends="python3-setuptools python3-requests python3-yaml python3-zxcvbn"
depends="pass python3-defusedxml python3-magic python3-cryptography
-python3-SecretStorage python3-pykeepass python3-yaml"
-checkdepends="python3-pytest $depends"
+python3-SecretStorage python3-pykeepass python3-requests python3-yaml lastpass-cli python3-zxcvbn"
+checkdepends="$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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+distfiles="${PYPI_SITE}/p/pass-import/pass-import-${version}.tar.gz"
+checksum=f4cc7c5bb493d3e8936fa6a7cc4b744d6851a0cfb51dc20b2d1d0a6c1e9f3e9c
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (6 preceding siblings ...)
2022-12-01 19:44 ` [PR PATCH] [Updated] " adbrown101
@ 2022-12-01 19:47 ` adbrown101
2022-12-01 19:53 ` paper42
` (7 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-12-01 19:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
New review comment by adbrown101 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1037502443
Comment:
Sorry it was a mistake. Still looking at the `./xbps-src check`
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (7 preceding siblings ...)
2022-12-01 19:47 ` [PR REVIEW] " adbrown101
@ 2022-12-01 19:53 ` paper42
2022-12-01 19:56 ` paper42
` (6 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-12-01 19:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1037507995
Comment:
don't remove pytest
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (8 preceding siblings ...)
2022-12-01 19:53 ` paper42
@ 2022-12-01 19:56 ` paper42
2022-12-01 19:56 ` paper42
` (5 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-12-01 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 383 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1037510285
Comment:
oh, the pypi tarball doesn't have tests, in that case, could you just add
```
# pypi tarball doesn't contain tests and the github release doesn't contain pre-built manpages (is this true?)
# <link to sgn's issue>
make_check=no
```
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (9 preceding siblings ...)
2022-12-01 19:56 ` paper42
@ 2022-12-01 19:56 ` paper42
2022-12-01 20:00 ` [PR PATCH] [Updated] " adbrown101
` (4 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: paper42 @ 2022-12-01 19:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1037510285
Comment:
oh, the pypi tarball doesn't have tests, in that case, could you just add
```sh
# pypi tarball doesn't contain tests and the github release doesn't contain pre-built manpages (is this true?)
# <link to sgn's issue>
make_check=no
```
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (10 preceding siblings ...)
2022-12-01 19:56 ` paper42
@ 2022-12-01 20:00 ` adbrown101
2022-12-03 15:56 ` adbrown101
` (3 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-12-01 20:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 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/40801
pass-import: update to 3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
A patch file from https://github.com/void-linux/void-packages/pull/40801.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-40801.patch --]
[-- Type: text/x-diff, Size: 2846 bytes --]
From c5d80f464fcac2f73ab44fbe78fc8cca6b5bc876 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 15 Nov 2022 18:27:00 +0000
Subject: [PATCH] pass-import: update to 3.3.
---
srcpkgs/pass-import/patches/makedoc.patch | 32 +++++++++++++++++++++++
srcpkgs/pass-import/template | 12 ++++-----
2 files changed, 38 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/pass-import/patches/makedoc.patch
diff --git a/srcpkgs/pass-import/patches/makedoc.patch b/srcpkgs/pass-import/patches/makedoc.patch
new file mode 100644
index 000000000000..7fe5175fb2e3
--- /dev/null
+++ b/srcpkgs/pass-import/patches/makedoc.patch
@@ -0,0 +1,32 @@
+--- a/setup.py
++++ b/setup.py
+@@ -5,29 +5,11 @@
+ import os
+ import sys
+
+-try:
+- import pypandoc
+- PANDOC = True
+-except ImportError:
+- PANDOC = False
+ from pathlib import Path
+
+-from share import makedoc
+ from setuptools import setup
+
+
+-makedoc()
+-if not PANDOC:
+- print("Warning: 'pypandoc' is required to generate the manual pages.")
+-else:
+- try:
+- for name in ['pass-import', 'pimport']:
+- pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
+- outputfile=f"share/man/man1/{name}.1",
+- extra_args=['--standalone'])
+- except OSError:
+- print("Warning: 'pandoc' is not installed.")
+-
+
+ share = Path(sys.prefix, 'share')
+ base = '/usr'
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 05b93ebdd1b0..a57450b699ae 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,17 +1,17 @@
# Template file for 'pass-import'
pkgname=pass-import
-version=3.2
-revision=2
+version=3.3
+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"
+hostmakedepends="python3-setuptools python3-requests python3-yaml python3-zxcvbn"
depends="pass python3-defusedxml python3-magic python3-cryptography
-python3-SecretStorage python3-pykeepass python3-yaml"
+python3-SecretStorage python3-pykeepass python3-requests python3-yaml lastpass-cli python3-zxcvbn"
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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+distfiles="${PYPI_SITE}/p/pass-import/pass-import-${version}.tar.gz"
+checksum=f4cc7c5bb493d3e8936fa6a7cc4b744d6851a0cfb51dc20b2d1d0a6c1e9f3e9c
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (11 preceding siblings ...)
2022-12-01 20:00 ` [PR PATCH] [Updated] " adbrown101
@ 2022-12-03 15:56 ` adbrown101
2022-12-03 16:01 ` adbrown101
` (2 subsequent siblings)
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-12-03 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 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/40801
pass-import: update to 3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
A patch file from https://github.com/void-linux/void-packages/pull/40801.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-40801.patch --]
[-- Type: text/x-diff, Size: 3013 bytes --]
From 4c2f254d5439b03a1b0838ecd678d6b4d72138c8 Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 15 Nov 2022 18:27:00 +0000
Subject: [PATCH] pass-import: update to 3.3.
---
srcpkgs/pass-import/patches/makedoc.patch | 32 +++++++++++++++++++++++
srcpkgs/pass-import/template | 15 ++++++-----
2 files changed, 41 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/pass-import/patches/makedoc.patch
diff --git a/srcpkgs/pass-import/patches/makedoc.patch b/srcpkgs/pass-import/patches/makedoc.patch
new file mode 100644
index 000000000000..7fe5175fb2e3
--- /dev/null
+++ b/srcpkgs/pass-import/patches/makedoc.patch
@@ -0,0 +1,32 @@
+--- a/setup.py
++++ b/setup.py
+@@ -5,29 +5,11 @@
+ import os
+ import sys
+
+-try:
+- import pypandoc
+- PANDOC = True
+-except ImportError:
+- PANDOC = False
+ from pathlib import Path
+
+-from share import makedoc
+ from setuptools import setup
+
+
+-makedoc()
+-if not PANDOC:
+- print("Warning: 'pypandoc' is required to generate the manual pages.")
+-else:
+- try:
+- for name in ['pass-import', 'pimport']:
+- pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
+- outputfile=f"share/man/man1/{name}.1",
+- extra_args=['--standalone'])
+- except OSError:
+- print("Warning: 'pandoc' is not installed.")
+-
+
+ share = Path(sys.prefix, 'share')
+ base = '/usr'
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 05b93ebdd1b0..b96ee0f13904 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,17 +1,20 @@
# Template file for 'pass-import'
pkgname=pass-import
-version=3.2
-revision=2
+version=3.3
+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"
+hostmakedepends="python3-setuptools python3-requests python3-yaml python3-zxcvbn"
depends="pass python3-defusedxml python3-magic python3-cryptography
-python3-SecretStorage python3-pykeepass python3-yaml"
+python3-SecretStorage python3-pykeepass python3-requests python3-yaml lastpass-cli python3-zxcvbn"
checkdepends="python3-pytest $depends"
+# pypi tarball doesn't contain tests and the github release doesn't contain pre-built manpages
+# https://github.com/roddhjav/pass-import/issues/192
+make_check=no
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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+distfiles="${PYPI_SITE}/p/pass-import/pass-import-${version}.tar.gz"
+checksum=f4cc7c5bb493d3e8936fa6a7cc4b744d6851a0cfb51dc20b2d1d0a6c1e9f3e9c
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Updated] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (12 preceding siblings ...)
2022-12-03 15:56 ` adbrown101
@ 2022-12-03 16:01 ` adbrown101
2022-12-03 16:07 ` [PR REVIEW] " adbrown101
2022-12-03 18:14 ` [PR PATCH] [Merged]: " sgn
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-12-03 16:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1115 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/40801
pass-import: update to 3.3.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
A patch file from https://github.com/void-linux/void-packages/pull/40801.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pass-import-40801.patch --]
[-- Type: text/x-diff, Size: 3013 bytes --]
From c8fc988ec35fa5237d80cdf9c081f1a2817bae7c Mon Sep 17 00:00:00 2001
From: Alan Brown <adbrown@rocketmail.com>
Date: Tue, 15 Nov 2022 18:27:00 +0000
Subject: [PATCH] pass-import: update to 3.3.
---
srcpkgs/pass-import/patches/makedoc.patch | 32 +++++++++++++++++++++++
srcpkgs/pass-import/template | 15 ++++++-----
2 files changed, 41 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/pass-import/patches/makedoc.patch
diff --git a/srcpkgs/pass-import/patches/makedoc.patch b/srcpkgs/pass-import/patches/makedoc.patch
new file mode 100644
index 000000000000..7fe5175fb2e3
--- /dev/null
+++ b/srcpkgs/pass-import/patches/makedoc.patch
@@ -0,0 +1,32 @@
+--- a/setup.py
++++ b/setup.py
+@@ -5,29 +5,11 @@
+ import os
+ import sys
+
+-try:
+- import pypandoc
+- PANDOC = True
+-except ImportError:
+- PANDOC = False
+ from pathlib import Path
+
+-from share import makedoc
+ from setuptools import setup
+
+
+-makedoc()
+-if not PANDOC:
+- print("Warning: 'pypandoc' is required to generate the manual pages.")
+-else:
+- try:
+- for name in ['pass-import', 'pimport']:
+- pypandoc.convert_file(f"share/man/man1/{name}.md", 'man',
+- outputfile=f"share/man/man1/{name}.1",
+- extra_args=['--standalone'])
+- except OSError:
+- print("Warning: 'pandoc' is not installed.")
+-
+
+ share = Path(sys.prefix, 'share')
+ base = '/usr'
diff --git a/srcpkgs/pass-import/template b/srcpkgs/pass-import/template
index 05b93ebdd1b0..fda554495b82 100644
--- a/srcpkgs/pass-import/template
+++ b/srcpkgs/pass-import/template
@@ -1,17 +1,20 @@
# Template file for 'pass-import'
pkgname=pass-import
-version=3.2
-revision=2
+version=3.3
+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"
+hostmakedepends="python3-setuptools python3-requests python3-yaml python3-zxcvbn"
depends="pass python3-defusedxml python3-magic python3-cryptography
-python3-SecretStorage python3-pykeepass python3-yaml"
+python3-SecretStorage python3-pykeepass python3-requests python3-yaml lastpass-cli python3-zxcvbn"
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=d943df14dcfec063a6c881c315ce65813db6e105b14a9b0156a73dcf7e529b76
+distfiles="${PYPI_SITE}/p/pass-import/pass-import-${version}.tar.gz"
+checksum=f4cc7c5bb493d3e8936fa6a7cc4b744d6851a0cfb51dc20b2d1d0a6c1e9f3e9c
+# pypi tarball doesn't contain tests and the github release doesn't contain pre-built manpages
+# https://github.com/roddhjav/pass-import/issues/192
+make_check=no
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR REVIEW] pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (13 preceding siblings ...)
2022-12-03 16:01 ` adbrown101
@ 2022-12-03 16:07 ` adbrown101
2022-12-03 18:14 ` [PR PATCH] [Merged]: " sgn
15 siblings, 0 replies; 17+ messages in thread
From: adbrown101 @ 2022-12-03 16:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 389 bytes --]
New review comment by adbrown101 on void-packages repository
https://github.com/void-linux/void-packages/pull/40801#discussion_r1038803226
Comment:
Yes the first iteration did build from github and it requires pandoc to build markdown man files
```
ls -l share/man/man1/
-rw-r--r-- 1 alan alan 20046 Sep 10 23:19 pass-import.md
-rw-r--r-- 1 alan alan 8795 Sep 10 23:19 pimport.md
^ permalink raw reply [flat|nested] 17+ messages in thread
* Re: [PR PATCH] [Merged]: pass-import: update to 3.3.
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
` (14 preceding siblings ...)
2022-12-03 16:07 ` [PR REVIEW] " adbrown101
@ 2022-12-03 18:14 ` sgn
15 siblings, 0 replies; 17+ messages in thread
From: sgn @ 2022-12-03 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 949 bytes --]
There's a merged pull request on the void-packages repository
pass-import: update to 3.3.
https://github.com/void-linux/void-packages/pull/40801
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
-->
^ permalink raw reply [flat|nested] 17+ messages in thread
end of thread, other threads:[~2022-12-03 18:14 UTC | newest]
Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-27 14:15 [PR PATCH] pass-import: update to 3.3 adbrown101
2022-11-27 15:52 ` [PR REVIEW] " sgn
2022-11-27 15:55 ` sgn
2022-11-29 12:40 ` adbrown101
2022-11-30 20:00 ` [PR PATCH] [Updated] " adbrown101
2022-11-30 20:03 ` [PR REVIEW] " adbrown101
2022-11-30 20:21 ` paper42
2022-12-01 19:44 ` [PR PATCH] [Updated] " adbrown101
2022-12-01 19:47 ` [PR REVIEW] " adbrown101
2022-12-01 19:53 ` paper42
2022-12-01 19:56 ` paper42
2022-12-01 19:56 ` paper42
2022-12-01 20:00 ` [PR PATCH] [Updated] " adbrown101
2022-12-03 15:56 ` adbrown101
2022-12-03 16:01 ` adbrown101
2022-12-03 16:07 ` [PR REVIEW] " adbrown101
2022-12-03 18:14 ` [PR PATCH] [Merged]: " sgn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).