* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
@ 2021-08-29 18:14 ` k4leg
2021-08-29 18:17 ` k4leg
` (35 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-08-29 18:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 16532 bytes --]
From d67b7285343368efb5da6efa50341e1c025f5a2b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 01:05:08 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 17 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 165 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..fddcf5cc6eb1
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+_pkgname=python-debian
+version=0.1.40
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3>=3.3 python3-chardet python3-six"
+checkdepends="python3-pip dpkg tar"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://salsa.debian.org/python-debian-team/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="${homepage}/-/archive/${version}/${_pkgname}-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..3937dc8b373c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+site='https://salsa.debian.org/python-debian-team/python-debian/tags?format=atom'
+pattern='<title>\K[\d.]+(?=</title>)'
From 41c45da2bb335c63acac944efebbdefd63608d4f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 14:45:59 +0300
Subject: [PATCH 2/5] New package: python-boolean.py-3.8
---
srcpkgs/python-boolean.py/template | 32 ++++++++++++++++++++++++++++++
srcpkgs/python3-boolean.py | 1 +
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python-boolean.py/template
create mode 120000 srcpkgs/python3-boolean.py
diff --git a/srcpkgs/python-boolean.py/template b/srcpkgs/python-boolean.py/template
new file mode 100644
index 000000000000..86e5fd002774
--- /dev/null
+++ b/srcpkgs/python-boolean.py/template
@@ -0,0 +1,32 @@
+# Template file for 'python-boolean.py'
+pkgname=python-boolean.py
+_pkgname=boolean.py
+version=3.8
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python>=2.7"
+checkdepends="tox>=2.7"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bastikr/boolean.py"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+do_check() {
+ tox -e "py${py2_ver/.},py${py3_ver/.}"
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+python3-boolean.py_package() {
+ depends="python3"
+ pkg_install() {
+ vmove "$py3_lib"
+ vlicense LICENSE.txt
+ }
+}
diff --git a/srcpkgs/python3-boolean.py b/srcpkgs/python3-boolean.py
new file mode 120000
index 000000000000..173e275406a9
--- /dev/null
+++ b/srcpkgs/python3-boolean.py
@@ -0,0 +1 @@
+python-boolean.py
\ No newline at end of file
From 136ddec4b697799c8a52da4b822d738d5b7df970 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 15:32:40 +0300
Subject: [PATCH 3/5] New package: python-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++
srcpkgs/python-binaryornot/template | 33 +++++++++++++++++++
srcpkgs/python3-binaryornot | 1 +
3 files changed, 56 insertions(+)
create mode 100644 srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python-binaryornot/template
create mode 120000 srcpkgs/python3-binaryornot
diff --git a/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python-binaryornot/template b/srcpkgs/python-binaryornot/template
new file mode 100644
index 000000000000..543b2f2a1a50
--- /dev/null
+++ b/srcpkgs/python-binaryornot/template
@@ -0,0 +1,33 @@
+# Template file for 'python-binaryornot'
+pkgname=python-binaryornot
+_pkgname=binaryornot
+version=0.4.4
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python>=2.7 python-chardet>=3.0.2"
+checkdepends="tox"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/audreyfeldroy/binaryornot"
+# Don't use PyPI because some test files are missing.
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=8cca04876a5e9d01f0dda79390e99089da87f3c1948ab2720661ba379d1b23f2
+
+do_check() {
+ tox -e "py${py2_ver/.},py${py3_ver/.}"
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-binaryornot_package() {
+ depends="python3>=3.3 python3-chardet>=3.0.2"
+ pkg_install() {
+ vmove "$py3_lib"
+ vlicense LICENSE
+ }
+}
diff --git a/srcpkgs/python3-binaryornot b/srcpkgs/python3-binaryornot
new file mode 120000
index 000000000000..7a220c40a9b7
--- /dev/null
+++ b/srcpkgs/python3-binaryornot
@@ -0,0 +1 @@
+python-binaryornot
\ No newline at end of file
From b24f6699bf25bca585ef8089e1caef0da0dcb711 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 18:46:32 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..2144ff39366a
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+_pkgname=license-expression
+version=21.6.14
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools>=50 python3-wheel python3-pip"
+depends="python3>=3.6 python3-boolean.py>=3.6<4"
+checkdepends="tox"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/nexB/license-expression"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
+
+do_check() {
+ tox -e "py${py3_ver/.}"
+}
From 8746bc593b419fc2210437b78b3767f787c25c3b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 19:09:05 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..2f9da7e54b4e
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,20 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools>=52 python3-setuptools_scm>=5.0.1"
+depends="python3>=3.6 python3-binaryornot>=0.4.4 python3-boolean.py>=3.8
+ python3-debian>=0.1.38 python3-Jinja2>=2.11.3 python3-license-expression>=1.2
+ python3-requests>=2.25.1"
+checkdepends="tox>=3.21.2"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://github.com/fsfe/reuse-tool"
+distfiles="${PYPI_SITE}/${pkgname::1}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+
+do_check() {
+ tox -e "py${py3_ver/.}"
+}
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
2021-08-29 18:14 ` [PR PATCH] [Updated] " k4leg
@ 2021-08-29 18:17 ` k4leg
2021-08-29 19:25 ` k4leg
` (34 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-08-29 18:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 16539 bytes --]
From d67b7285343368efb5da6efa50341e1c025f5a2b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 01:05:08 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 17 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 165 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..fddcf5cc6eb1
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+_pkgname=python-debian
+version=0.1.40
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3>=3.3 python3-chardet python3-six"
+checkdepends="python3-pip dpkg tar"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://salsa.debian.org/python-debian-team/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="${homepage}/-/archive/${version}/${_pkgname}-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..3937dc8b373c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+site='https://salsa.debian.org/python-debian-team/python-debian/tags?format=atom'
+pattern='<title>\K[\d.]+(?=</title>)'
From 41c45da2bb335c63acac944efebbdefd63608d4f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 14:45:59 +0300
Subject: [PATCH 2/5] New package: python-boolean.py-3.8
---
srcpkgs/python-boolean.py/template | 32 ++++++++++++++++++++++++++++++
srcpkgs/python3-boolean.py | 1 +
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python-boolean.py/template
create mode 120000 srcpkgs/python3-boolean.py
diff --git a/srcpkgs/python-boolean.py/template b/srcpkgs/python-boolean.py/template
new file mode 100644
index 000000000000..86e5fd002774
--- /dev/null
+++ b/srcpkgs/python-boolean.py/template
@@ -0,0 +1,32 @@
+# Template file for 'python-boolean.py'
+pkgname=python-boolean.py
+_pkgname=boolean.py
+version=3.8
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python>=2.7"
+checkdepends="tox>=2.7"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bastikr/boolean.py"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+do_check() {
+ tox -e "py${py2_ver/.},py${py3_ver/.}"
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+python3-boolean.py_package() {
+ depends="python3"
+ pkg_install() {
+ vmove "$py3_lib"
+ vlicense LICENSE.txt
+ }
+}
diff --git a/srcpkgs/python3-boolean.py b/srcpkgs/python3-boolean.py
new file mode 120000
index 000000000000..173e275406a9
--- /dev/null
+++ b/srcpkgs/python3-boolean.py
@@ -0,0 +1 @@
+python-boolean.py
\ No newline at end of file
From 000a406a3a7ff667c46ba987d66bfff4720c801b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 15:32:40 +0300
Subject: [PATCH 3/5] New package: python-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++
srcpkgs/python-binaryornot/template | 33 +++++++++++++++++++
srcpkgs/python3-binaryornot | 1 +
3 files changed, 56 insertions(+)
create mode 100644 srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python-binaryornot/template
create mode 120000 srcpkgs/python3-binaryornot
diff --git a/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python-binaryornot/template b/srcpkgs/python-binaryornot/template
new file mode 100644
index 000000000000..eb360a4349e5
--- /dev/null
+++ b/srcpkgs/python-binaryornot/template
@@ -0,0 +1,33 @@
+# Template file for 'python-binaryornot'
+pkgname=python-binaryornot
+_pkgname=binaryornot
+version=0.4.4
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python>=2.7 python-chardet>=3.0.2"
+checkdepends="tox"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/audreyfeldroy/binaryornot"
+# Don't use PyPI because some files for testing are missing.
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=8cca04876a5e9d01f0dda79390e99089da87f3c1948ab2720661ba379d1b23f2
+
+do_check() {
+ tox -e "py${py2_ver/.},py${py3_ver/.}"
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-binaryornot_package() {
+ depends="python3>=3.3 python3-chardet>=3.0.2"
+ pkg_install() {
+ vmove "$py3_lib"
+ vlicense LICENSE
+ }
+}
diff --git a/srcpkgs/python3-binaryornot b/srcpkgs/python3-binaryornot
new file mode 120000
index 000000000000..7a220c40a9b7
--- /dev/null
+++ b/srcpkgs/python3-binaryornot
@@ -0,0 +1 @@
+python-binaryornot
\ No newline at end of file
From 155c5513755ecfabd8d434bbd9182a6cae4eef82 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 18:46:32 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..2144ff39366a
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+_pkgname=license-expression
+version=21.6.14
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools>=50 python3-wheel python3-pip"
+depends="python3>=3.6 python3-boolean.py>=3.6<4"
+checkdepends="tox"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/nexB/license-expression"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
+
+do_check() {
+ tox -e "py${py3_ver/.}"
+}
From f91d34b5e4d9fba77bfde9d287170ec120cc9eb8 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 19:09:05 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..2f9da7e54b4e
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,20 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools>=52 python3-setuptools_scm>=5.0.1"
+depends="python3>=3.6 python3-binaryornot>=0.4.4 python3-boolean.py>=3.8
+ python3-debian>=0.1.38 python3-Jinja2>=2.11.3 python3-license-expression>=1.2
+ python3-requests>=2.25.1"
+checkdepends="tox>=3.21.2"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://github.com/fsfe/reuse-tool"
+distfiles="${PYPI_SITE}/${pkgname::1}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+
+do_check() {
+ tox -e "py${py3_ver/.}"
+}
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
2021-08-29 18:14 ` [PR PATCH] [Updated] " k4leg
2021-08-29 18:17 ` k4leg
@ 2021-08-29 19:25 ` k4leg
2021-08-30 17:42 ` Chocimier
` (33 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-08-29 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 16560 bytes --]
From d67b7285343368efb5da6efa50341e1c025f5a2b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 01:05:08 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 17 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 165 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..fddcf5cc6eb1
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+_pkgname=python-debian
+version=0.1.40
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3>=3.3 python3-chardet python3-six"
+checkdepends="python3-pip dpkg tar"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://salsa.debian.org/python-debian-team/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="${homepage}/-/archive/${version}/${_pkgname}-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..3937dc8b373c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+site='https://salsa.debian.org/python-debian-team/python-debian/tags?format=atom'
+pattern='<title>\K[\d.]+(?=</title>)'
From 41c45da2bb335c63acac944efebbdefd63608d4f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 14:45:59 +0300
Subject: [PATCH 2/5] New package: python-boolean.py-3.8
---
srcpkgs/python-boolean.py/template | 32 ++++++++++++++++++++++++++++++
srcpkgs/python3-boolean.py | 1 +
2 files changed, 33 insertions(+)
create mode 100644 srcpkgs/python-boolean.py/template
create mode 120000 srcpkgs/python3-boolean.py
diff --git a/srcpkgs/python-boolean.py/template b/srcpkgs/python-boolean.py/template
new file mode 100644
index 000000000000..86e5fd002774
--- /dev/null
+++ b/srcpkgs/python-boolean.py/template
@@ -0,0 +1,32 @@
+# Template file for 'python-boolean.py'
+pkgname=python-boolean.py
+_pkgname=boolean.py
+version=3.8
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python>=2.7"
+checkdepends="tox>=2.7"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bastikr/boolean.py"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+do_check() {
+ tox -e "py${py2_ver/.},py${py3_ver/.}"
+}
+
+post_install() {
+ vlicense LICENSE.txt
+}
+
+python3-boolean.py_package() {
+ depends="python3"
+ pkg_install() {
+ vmove "$py3_lib"
+ vlicense LICENSE.txt
+ }
+}
diff --git a/srcpkgs/python3-boolean.py b/srcpkgs/python3-boolean.py
new file mode 120000
index 000000000000..173e275406a9
--- /dev/null
+++ b/srcpkgs/python3-boolean.py
@@ -0,0 +1 @@
+python-boolean.py
\ No newline at end of file
From 000a406a3a7ff667c46ba987d66bfff4720c801b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 15:32:40 +0300
Subject: [PATCH 3/5] New package: python-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++
srcpkgs/python-binaryornot/template | 33 +++++++++++++++++++
srcpkgs/python3-binaryornot | 1 +
3 files changed, 56 insertions(+)
create mode 100644 srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python-binaryornot/template
create mode 120000 srcpkgs/python3-binaryornot
diff --git a/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python-binaryornot/template b/srcpkgs/python-binaryornot/template
new file mode 100644
index 000000000000..eb360a4349e5
--- /dev/null
+++ b/srcpkgs/python-binaryornot/template
@@ -0,0 +1,33 @@
+# Template file for 'python-binaryornot'
+pkgname=python-binaryornot
+_pkgname=binaryornot
+version=0.4.4
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
+depends="python>=2.7 python-chardet>=3.0.2"
+checkdepends="tox"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/audreyfeldroy/binaryornot"
+# Don't use PyPI because some files for testing are missing.
+distfiles="${homepage}/archive/${version}.tar.gz"
+checksum=8cca04876a5e9d01f0dda79390e99089da87f3c1948ab2720661ba379d1b23f2
+
+do_check() {
+ tox -e "py${py2_ver/.},py${py3_ver/.}"
+}
+
+post_install() {
+ vlicense LICENSE
+}
+
+python3-binaryornot_package() {
+ depends="python3>=3.3 python3-chardet>=3.0.2"
+ pkg_install() {
+ vmove "$py3_lib"
+ vlicense LICENSE
+ }
+}
diff --git a/srcpkgs/python3-binaryornot b/srcpkgs/python3-binaryornot
new file mode 120000
index 000000000000..7a220c40a9b7
--- /dev/null
+++ b/srcpkgs/python3-binaryornot
@@ -0,0 +1 @@
+python-binaryornot
\ No newline at end of file
From 155c5513755ecfabd8d434bbd9182a6cae4eef82 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 18:46:32 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..2144ff39366a
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+_pkgname=license-expression
+version=21.6.14
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools>=50 python3-wheel python3-pip"
+depends="python3>=3.6 python3-boolean.py>=3.6<4"
+checkdepends="tox"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/nexB/license-expression"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
+
+do_check() {
+ tox -e "py${py3_ver/.}"
+}
From 47c9b713700911fada1a9ff4037d2dfa06dd0501 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Fri, 27 Aug 2021 19:09:05 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..d2643c303f1a
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,21 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools>=52 python3-setuptools_scm>=5.0.1"
+depends="python3>=3.6 python3-binaryornot>=0.4.4 python3-boolean.py>=3.8
+ python3-debian>=0.1.38 python3-Jinja2>=2.11.3 python3-license-expression>=1.2
+ python3-requests>=2.25.1"
+checkdepends="tox>=3.21.2"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://github.com/fsfe/reuse-tool"
+distfiles="${PYPI_SITE}/${pkgname::1}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+make_check=ci-skip
+
+do_check() {
+ tox -e "py${py3_ver/.}"
+}
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (2 preceding siblings ...)
2021-08-29 19:25 ` k4leg
@ 2021-08-30 17:42 ` Chocimier
2021-08-30 17:46 ` Chocimier
` (32 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-08-30 17:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908549747
Comment:
- no new py2 packages are accepted
- depending on minimal version of module is going to stale, please either provide tool to keep it up to date on update, or drop
- testing with tox undex xbps-src is useless, try good deprecated things
- `make_check=` has to be justified
- no need do depend on interpreter when depending on module
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (3 preceding siblings ...)
2021-08-30 17:42 ` Chocimier
@ 2021-08-30 17:46 ` Chocimier
2021-08-30 18:01 ` paper42
` (31 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-08-30 17:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908552547
Comment:
- please use pypi as homepage for packages not fetched from pypi, this helps find upstream in case it moves
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (4 preceding siblings ...)
2021-08-30 17:46 ` Chocimier
@ 2021-08-30 18:01 ` paper42
2021-08-30 18:01 ` paper42
` (30 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-08-30 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908562442
Comment:
> - please use pypi as homepage for packages not fetched from pypi, this helps find upstream in case it moves
PyPi tarballs also remove tests, so I think it would be nicer to use the non-pypi tarballs when there are tests to run.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (5 preceding siblings ...)
2021-08-30 18:01 ` paper42
@ 2021-08-30 18:01 ` paper42
2021-08-30 18:05 ` Chocimier
` (29 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-08-30 18:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908562442
Comment:
> - please use pypi as homepage for packages not fetched from pypi, this helps find upstream in case it moves
PyPI tarballs also remove tests, so I think it would be nicer to use the non-pypi tarballs when there are tests to run.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (6 preceding siblings ...)
2021-08-30 18:01 ` paper42
@ 2021-08-30 18:05 ` Chocimier
2021-08-30 18:16 ` paper42
` (28 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-08-30 18:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 265 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908565977
Comment:
> nicer to use the non-pypi tarballs
Makes sense if this is case for these packages, but don't that depend on setup.py?
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (7 preceding siblings ...)
2021-08-30 18:05 ` Chocimier
@ 2021-08-30 18:16 ` paper42
2021-08-30 18:25 ` Chocimier
` (27 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-08-30 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 375 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908573952
Comment:
> > nicer to use the non-pypi tarballs
>
> Makes sense if this is case for these packages, but don't that depend on setup.py?
setup.py test is the old way of running tests, for modern projects, we can use pytest from python3-pytest.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (8 preceding siblings ...)
2021-08-30 18:16 ` paper42
@ 2021-08-30 18:25 ` Chocimier
2021-08-30 18:36 ` paper42
` (26 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-08-30 18:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908580852
Comment:
I mean boolean.py pypi tarball includes tests.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (9 preceding siblings ...)
2021-08-30 18:25 ` Chocimier
@ 2021-08-30 18:36 ` paper42
2021-08-30 18:45 ` k4leg
` (25 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-08-30 18:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 309 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908588030
Comment:
> I mean boolean.py pypi tarball includes tests.
I get your point now. Some projects have their tests in pypi tarballs, some don't, so we could check for each package.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (10 preceding siblings ...)
2021-08-30 18:36 ` paper42
@ 2021-08-30 18:45 ` k4leg
2021-08-30 19:17 ` Chocimier
` (24 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-08-30 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 662 bytes --]
New comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908593853
Comment:
> * `make_check=` has to be justified
I don't understand why but the tests fail in CI (see [this](https://github.com/void-linux/void-packages/actions/runs/1179827994)). With a local build everything is fine. Perhaps this will change after switching from tox to other.
> * testing with tox undex xbps-src is useless, try good deprecated things
Btw I saw in some packages tests are missing because some dependencies are missing. Is it okay to do the same or is it better to pack them? This is why I used tox.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (11 preceding siblings ...)
2021-08-30 18:45 ` k4leg
@ 2021-08-30 19:17 ` Chocimier
2021-09-01 19:49 ` [PR PATCH] [Updated] " k4leg
` (23 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-08-30 19:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 234 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#issuecomment-908618206
Comment:
Best is to selectively disable tests that fail for known reason, and report other upstream.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (12 preceding siblings ...)
2021-08-30 19:17 ` Chocimier
@ 2021-09-01 19:49 ` k4leg
2021-09-02 17:32 ` [PR REVIEW] " paper42
` (22 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-01 19:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15274 bytes --]
From d87154cf8261a83263cbe8f478141c0559389f65 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 17 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 165 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d1c948270a88
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+_pkgname=python-debian
+version=0.1.40
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="${homepage}/-/archive/${version}/${_pkgname}-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..3937dc8b373c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+site='https://salsa.debian.org/python-debian-team/python-debian/tags?format=atom'
+pattern='<title>\K[\d.]+(?=</title>)'
From 9f84f78a4074fb01163ffac30edbbb4c9d847a1b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..00875b9cc1f1
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+_pkgname=boolean.py
+version=3.8
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/boolean.py"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ vlicense LICENSE.txt
+}
From b4b333cb2c3143a0d14ea9a8d86216d62dbad9ad Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 20 +++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..09f5c1ba2f82
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+_pkgname=binaryornot
+version=0.4.4
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet>=3.0.2"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/binaryornot"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 93fe1eee931fb0c0f19e94875b130fe177630d55 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..f4483b908362
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+_pkgname=license-expression
+version=21.6.14
+revision=1
+wrksrc="${_pkgname}-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools>=50 python3-setuptools_scm>=6"
+depends="python3-boolean.py>=3.6<4"
+checkdepends="python3-pytest>=6 $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/license-expression"
+distfiles="${PYPI_SITE}/${_pkgname::1}/${_pkgname}/${_pkgname}-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From a2859f0cb9379fb9a92feeaff6b605c134ae5650 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..148fac491c34
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,16 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools>=52 python3-setuptools_scm>=5.0.1 gettext"
+depends="python3-binaryornot>=0.4.4 python3-boolean.py>=3.8
+ python3-debian>=0.1.38 python3-Jinja2>=2.11.3 python3-license-expression>=1.2
+ python3-requests>=2.25.1"
+checkdepends="python3-pytest>=6.2.2 $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://pypi.org/project/reuse"
+distfiles="${PYPI_SITE}/${pkgname::1}/${pkgname}/${pkgname}-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (13 preceding siblings ...)
2021-09-01 19:49 ` [PR PATCH] [Updated] " k4leg
@ 2021-09-02 17:32 ` paper42
2021-09-02 17:32 ` paper42
` (21 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-02 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 269 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r701283477
Comment:
remove this variable and replace where it's used with `binaryornot` (similar change should also be done in other packages)
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (14 preceding siblings ...)
2021-09-02 17:32 ` [PR REVIEW] " paper42
@ 2021-09-02 17:32 ` paper42
2021-09-02 17:32 ` paper42
` (20 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-02 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 239 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r701284113
Comment:
please remove the version constraints (similar change should also be done in other packages)
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (15 preceding siblings ...)
2021-09-02 17:32 ` paper42
@ 2021-09-02 17:32 ` paper42
2021-09-02 17:32 ` paper42
` (19 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-02 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 277 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r701289337
Comment:
we can make this prettier:
```
pkgname=python-debian
site=https://salsa.debian.org/python-debian-team/python-debian/-/tags
```
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (16 preceding siblings ...)
2021-09-02 17:32 ` paper42
@ 2021-09-02 17:32 ` paper42
2021-09-02 19:21 ` k4leg
` (18 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-02 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r701284935
Comment:
we prefer not using `$homepage` in `$distfiles`
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (17 preceding siblings ...)
2021-09-02 17:32 ` paper42
@ 2021-09-02 19:21 ` k4leg
2021-09-02 19:33 ` [PR PATCH] [Updated] " k4leg
` (17 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-02 19:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New review comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r701359418
Comment:
Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (18 preceding siblings ...)
2021-09-02 19:21 ` k4leg
@ 2021-09-02 19:33 ` k4leg
2021-09-02 19:50 ` k4leg
` (16 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-02 19:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15066 bytes --]
From 0442a701e622096d970f7d1a6e2a2fea68e8e34f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 16 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 164 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d618284b6ee0
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From 59b3042d6968bc016f041203704695af9e1b15ef Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..e5f13b78e547
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/boolean.py"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 70843e63adf94139938f5f34486f7d53200580ef Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 19 ++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..116223a190c5
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/binaryornot"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 82c6acb66984ac9789e079af86c7999cd6f7e28f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..7bbf81e0de5e
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/license-expression"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From fc8c3c3d61391abb4c92d1cddca694f05cd016c5 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..03477ab98252
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,15 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://pypi.org/project/reuse"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (19 preceding siblings ...)
2021-09-02 19:33 ` [PR PATCH] [Updated] " k4leg
@ 2021-09-02 19:50 ` k4leg
2021-09-04 9:38 ` k4leg
` (15 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-02 19:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15145 bytes --]
From 0442a701e622096d970f7d1a6e2a2fea68e8e34f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 16 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 164 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d618284b6ee0
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From 59b3042d6968bc016f041203704695af9e1b15ef Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..e5f13b78e547
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/boolean.py"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 70843e63adf94139938f5f34486f7d53200580ef Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 19 ++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..116223a190c5
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/binaryornot"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 82c6acb66984ac9789e079af86c7999cd6f7e28f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..7bbf81e0de5e
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/license-expression"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From 07702467e63eb547ad8d63b4461860c182c53dc2 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..073ef5da97cd
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,16 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://pypi.org/project/reuse"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+make_check=ci-skip # The local build passes the tests but not the CI build.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (20 preceding siblings ...)
2021-09-02 19:50 ` k4leg
@ 2021-09-04 9:38 ` k4leg
2021-09-04 20:15 ` [PR REVIEW] " Chocimier
` (14 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-04 9:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15203 bytes --]
From 0442a701e622096d970f7d1a6e2a2fea68e8e34f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 16 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 164 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d618284b6ee0
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From bd311e1e3ab61b0695ca6e6c2319727f6a675e94 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..cc32e3756db0
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/boolean.py"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ rm "${DESTDIR}/${py3_sitelib}/boolean/test_boolean.py"
+ vlicense LICENSE.txt
+}
From 6c2e9e81472fb48c0be7cf6b6b395e4b2321b41e Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 19 ++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..116223a190c5
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/binaryornot"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 4470165ae438c169b0fa02a24d34297446a88d07 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..7bbf81e0de5e
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/license-expression"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From ca7ca225f5d4229140b7e8792f1494bda7220f98 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..073ef5da97cd
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,16 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://pypi.org/project/reuse"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
+make_check=ci-skip # The local build passes the tests but not the CI build.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (21 preceding siblings ...)
2021-09-04 9:38 ` k4leg
@ 2021-09-04 20:15 ` Chocimier
2021-09-04 20:30 ` [PR PATCH] [Updated] " k4leg
` (13 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-09-04 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702324059
Comment:
This is a `a=b; // assign b to a` style comment. Could you remove `make_check=ci-skip` for a while to show what's wrong ?
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (22 preceding siblings ...)
2021-09-04 20:15 ` [PR REVIEW] " Chocimier
@ 2021-09-04 20:30 ` k4leg
2021-09-04 20:53 ` [PR REVIEW] " Chocimier
` (12 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-04 20:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15124 bytes --]
From 0442a701e622096d970f7d1a6e2a2fea68e8e34f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 16 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 164 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d618284b6ee0
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From bd311e1e3ab61b0695ca6e6c2319727f6a675e94 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..cc32e3756db0
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/boolean.py"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ rm "${DESTDIR}/${py3_sitelib}/boolean/test_boolean.py"
+ vlicense LICENSE.txt
+}
From 6c2e9e81472fb48c0be7cf6b6b395e4b2321b41e Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 19 ++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..116223a190c5
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/binaryornot"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 4470165ae438c169b0fa02a24d34297446a88d07 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..7bbf81e0de5e
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/license-expression"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From 18facc6253cfec1e1c49d0533c272673b766fe02 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..03477ab98252
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,15 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://pypi.org/project/reuse"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (23 preceding siblings ...)
2021-09-04 20:30 ` [PR PATCH] [Updated] " k4leg
@ 2021-09-04 20:53 ` Chocimier
2021-09-04 21:27 ` [PR PATCH] [Updated] " k4leg
` (11 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-09-04 20:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New review comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702327434
Comment:
So this is about three cases that assume no root privs. Disable them like in diffoscope template.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (24 preceding siblings ...)
2021-09-04 20:53 ` [PR REVIEW] " Chocimier
@ 2021-09-04 21:27 ` k4leg
2021-09-04 21:30 ` [PR REVIEW] " k4leg
` (10 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-04 21:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15219 bytes --]
From 0442a701e622096d970f7d1a6e2a2fea68e8e34f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 16 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 164 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d618284b6ee0
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From bd311e1e3ab61b0695ca6e6c2319727f6a675e94 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..cc32e3756db0
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://pypi.org/project/boolean.py"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ rm "${DESTDIR}/${py3_sitelib}/boolean/test_boolean.py"
+ vlicense LICENSE.txt
+}
From 6c2e9e81472fb48c0be7cf6b6b395e4b2321b41e Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 19 ++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..116223a190c5
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://pypi.org/project/binaryornot"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 4470165ae438c169b0fa02a24d34297446a88d07 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..7bbf81e0de5e
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://pypi.org/project/license-expression"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From fe75a69849afcce3afada969c9d2a01a32b50a79 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..a05d9f9920ae
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,16 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+make_check_args="-k not((test_lint_read_errors)or(test_generate_project_report_read_error))"
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://pypi.org/project/reuse"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (25 preceding siblings ...)
2021-09-04 21:27 ` [PR PATCH] [Updated] " k4leg
@ 2021-09-04 21:30 ` k4leg
2021-09-04 21:34 ` [PR PATCH] [Updated] " k4leg
` (9 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-04 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New review comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702330607
Comment:
Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (26 preceding siblings ...)
2021-09-04 21:30 ` [PR REVIEW] " k4leg
@ 2021-09-04 21:34 ` k4leg
2021-09-04 22:49 ` [PR REVIEW] " paper42
` (8 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-04 21:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15220 bytes --]
From 0442a701e622096d970f7d1a6e2a2fea68e8e34f Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 16 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 164 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..d618284b6ee0
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From 7265839667ff5a017bba48e8f58000002ef0b297 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..e53aefaf9ad6
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,18 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bastikr/boolean.py"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ rm "${DESTDIR}/${py3_sitelib}/boolean/test_boolean.py"
+ vlicense LICENSE.txt
+}
From f60b03d9fe8704af0cd19b2b806322b93e086628 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 19 ++++++++++++++++
2 files changed, 41 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..ddba7f3cb7f6
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/audreyfeldroy/binaryornot"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From fc6e67cd80ce96a7c706643ee92e7407532e2fe9 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..a4fdf352c2a9
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/nexB/license-expression"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From aa03aca17ff8a9ae8705f4f746d782e2625fbce5 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..27cd077b2868
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,16 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+make_check_args="-k not((test_lint_read_errors)or(test_generate_project_report_read_error))"
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC-BY-SA-4.0, CC0-1.0, Apache-2.0"
+homepage="https://reuse.software"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (27 preceding siblings ...)
2021-09-04 21:34 ` [PR PATCH] [Updated] " k4leg
@ 2021-09-04 22:49 ` paper42
2021-09-04 22:53 ` paper42
` (7 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-04 22:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 242 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702337058
Comment:
```
changelog="https://raw.githubusercontent.com/bastikr/boolean.py/master/CHANGELOG.rst"
```
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (28 preceding siblings ...)
2021-09-04 22:49 ` [PR REVIEW] " paper42
@ 2021-09-04 22:53 ` paper42
2021-09-04 22:53 ` paper42
` (6 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-04 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702337341
Comment:
```
changelog="https://raw.githubusercontent.com/nexB/license-expression/master/CHANGELOG.rst"
```
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (29 preceding siblings ...)
2021-09-04 22:53 ` paper42
@ 2021-09-04 22:53 ` paper42
2021-09-04 22:54 ` paper42
` (5 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-04 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 206 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702337387
Comment:
`--deselect=` should also work and it will be more readable
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (30 preceding siblings ...)
2021-09-04 22:53 ` paper42
@ 2021-09-04 22:54 ` paper42
2021-09-04 22:59 ` paper42
` (4 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-04 22:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 238 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702337439
Comment:
```
changelog="https://raw.githubusercontent.com/fsfe/reuse-tool/master/CHANGELOG.md"
```
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (31 preceding siblings ...)
2021-09-04 22:54 ` paper42
@ 2021-09-04 22:59 ` paper42
2021-09-05 11:09 ` k4leg
` (3 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: paper42 @ 2021-09-04 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702337759
Comment:
All original source code is licensed under GPL-3.0-or-later.
All documentation is licensed under CC-BY-SA-4.0.
Some configuration and data files are licensed under CC0-1.0.
Some code borrowed from spdx/tool-python is licensed under Apache-2.0.
I think we don't need to list CC* licenses here.
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (32 preceding siblings ...)
2021-09-04 22:59 ` paper42
@ 2021-09-05 11:09 ` k4leg
2021-09-05 11:37 ` k4leg
` (2 subsequent siblings)
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-05 11:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New review comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702407713
Comment:
Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR REVIEW] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (33 preceding siblings ...)
2021-09-05 11:09 ` k4leg
@ 2021-09-05 11:37 ` k4leg
2021-09-05 11:43 ` [PR PATCH] [Updated] " k4leg
2021-09-17 17:10 ` [PR PATCH] [Merged]: " Chocimier
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-05 11:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 356 bytes --]
New review comment by k4leg on void-packages repository
https://github.com/void-linux/void-packages/pull/32746#discussion_r702411039
Comment:
Yes you are right. But the package still contains files with license CC0-1.0 (for example `/usr/lib/pythonX.Y/site-packages/reuse/resources/exceptions.json`), so I will only remove license CC-BY-SA-4.0.
Thanks!
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Updated] New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (34 preceding siblings ...)
2021-09-05 11:37 ` k4leg
@ 2021-09-05 11:43 ` k4leg
2021-09-17 17:10 ` [PR PATCH] [Merged]: " Chocimier
36 siblings, 0 replies; 38+ messages in thread
From: k4leg @ 2021-09-05 11:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1645 bytes --]
There is an updated pull request by k4leg against master on the void-packages repository
https://github.com/k4leg/void-packages New-package-reuse
https://github.com/void-linux/void-packages/pull/32746
New package: reuse-0.13.0
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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/32746.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-New-package-reuse-32746.patch --]
[-- Type: text/x-diff, Size: 15717 bytes --]
From bc2523fd92385c87548899511b4340feb5508152 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:04:45 +0300
Subject: [PATCH 1/5] New package: python3-debian-0.1.40
---
.../0001-Disable-apt_pkg-support.patch | 146 ++++++++++++++++++
srcpkgs/python3-debian/template | 17 ++
srcpkgs/python3-debian/update | 2 +
3 files changed, 165 insertions(+)
create mode 100644 srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
create mode 100644 srcpkgs/python3-debian/template
create mode 100644 srcpkgs/python3-debian/update
diff --git a/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
new file mode 100644
index 000000000000..6765b2f6c3a0
--- /dev/null
+++ b/srcpkgs/python3-debian/patches/0001-Disable-apt_pkg-support.patch
@@ -0,0 +1,146 @@
+From e87972d4ae499d7049338ddb0d5009b6527a93dc Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 8 Feb 2021 22:24:33 -0500
+Subject: [PATCH] Disable apt_pkg support
+
+---
+ lib/debian/deb822.py | 4 +--
+ lib/debian/tests/test_deb822.py | 58 ---------------------------------
+ 2 files changed, 2 insertions(+), 60 deletions(-)
+
+diff --git a/lib/debian/deb822.py b/lib/debian/deb822.py
+index 46cf81a..158033f 100644
+--- a/lib/debian/deb822.py
++++ b/lib/debian/deb822.py
+@@ -2286,7 +2286,7 @@ class Sources(Dsc, _PkgRelationMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+@@ -2328,7 +2328,7 @@ class Packages(Deb822, _PkgRelationMixin, _VersionAccessorMixin):
+ def iter_paragraphs(cls,
+ sequence, # type: InputDataType
+ fields=None, # type: Optional[List[str]]
+- use_apt_pkg=True, # type: bool
++ use_apt_pkg=False, # type: bool
+ shared_storage=False, # type: bool
+ encoding="utf-8", # type: str
+ strict=None, # type: Optional[Dict[str, bool]]
+diff --git a/lib/debian/tests/test_deb822.py b/lib/debian/tests/test_deb822.py
+index f386391..7fb11fa 100755
+--- a/lib/debian/tests/test_deb822.py
++++ b/lib/debian/tests/test_deb822.py
+@@ -42,8 +42,6 @@ else:
+ from StringIO import StringIO
+ BytesIO = StringIO
+
+-import apt_pkg
+-
+ from debian import deb822
+ from debian.debian_support import Version
+
+@@ -541,11 +539,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- with self.assertWarns(UserWarning):
+- # The StringIO is not a real file so this will raise a warning
+- for d in deb822.Deb822.iter_paragraphs(text, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+ def test_iter_paragraphs_file(self):
+ # type: () -> None
+ text = StringIO()
+@@ -564,10 +557,6 @@ with open("test_deb822.pickle", "wb") as fh:
+ for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=False):
+ self.assertWellParsed(d, PARSED_PACKAGE)
+
+- fh.seek(0)
+- for d in deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True):
+- self.assertWellParsed(d, PARSED_PACKAGE)
+-
+
+ def test_iter_paragraphs_with_gpg(self):
+ # type: () -> None
+@@ -640,12 +629,7 @@ with open("test_deb822.pickle", "wb") as fh:
+ test_count(deb822.Deb822.iter_paragraphs, 2)
+ test_count(deb822.Deb822.iter_paragraphs, 2, use_apt_pkg=False)
+
+- # apt_pkg used, should not split
+- test_count(deb822.Deb822.iter_paragraphs, 1, use_apt_pkg=True)
+-
+ # Specialised iter_paragraphs force use of apt_pkg and don't split
+- test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=True)
+- test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=True)
+ test_count(deb822.Packages.iter_paragraphs, 1, use_apt_pkg=False)
+ test_count(deb822.Sources.iter_paragraphs, 1, use_apt_pkg=False)
+
+@@ -692,32 +676,12 @@ with open("test_deb822.pickle", "wb") as fh:
+ s.write(b"\n")
+ self.assertEqual(s.getvalue(), packages_content)
+
+- def test_iter_paragraphs_apt_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_packages(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Packages"),
+- deb822.Packages,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_packages(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Packages"),
+ deb822.Packages,
+ use_apt_pkg=False, shared_storage=False)
+
+- def test_iter_paragraphs_apt_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=True)
+- def test_iter_paragraphs_apt_no_shared_storage_sources(self):
+- # type: () -> None
+- self._test_iter_paragraphs(find_test_file("test_Sources"),
+- deb822.Sources,
+- use_apt_pkg=True, shared_storage=False)
+ def test_iter_paragraphs_no_apt_no_shared_storage_sources(self):
+ # type: () -> None
+ self._test_iter_paragraphs(find_test_file("test_Sources"),
+@@ -1091,28 +1055,6 @@ Description: python modules to work with Debian-related data formats
+ self.assertWellParsed(paragraphs[i],
+ PARSED_PARAGRAPHS_WITH_COMMENTS[i])
+
+- def test_iter_paragraphs_comments_use_apt_pkg(self):
+- # type: () -> None
+- """ apt_pkg does not support comments within multiline fields
+-
+- This test checks that a file with comments inside multiline fields
+- generates an error from the apt_pkg parser.
+-
+- See also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=750247#35
+- https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=807351
+- """
+- try:
+- fd, filename = tempfile.mkstemp()
+- fp = os.fdopen(fd, 'wb')
+- fp.write(UNPARSED_PARAGRAPHS_WITH_COMMENTS.encode('utf-8'))
+- fp.close()
+-
+- with open_utf8(filename) as fh:
+- with self.assertRaises(apt_pkg.Error):
+- list(deb822.Deb822.iter_paragraphs(fh, use_apt_pkg=True))
+- finally:
+- os.remove(filename)
+-
+ def test_iter_paragraphs_comments_native(self):
+ # type: () -> None
+ paragraphs = list(deb822.Deb822.iter_paragraphs(
+--
+2.30.0
+
diff --git a/srcpkgs/python3-debian/template b/srcpkgs/python3-debian/template
new file mode 100644
index 000000000000..5d35bef5f22e
--- /dev/null
+++ b/srcpkgs/python3-debian/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-debian'
+pkgname=python3-debian
+version=0.1.40
+revision=1
+wrksrc="python-debian-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet python3-six"
+checkdepends="dpkg tar $depends"
+short_desc="Python modules work with Debian-related data formats"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-2.0-or-later"
+homepage="https://pypi.org/project/python-debian"
+changelog="https://salsa.debian.org/python-debian-team/python-debian/raw/master/debian/changelog"
+# Don't use PyPI because it has no tests.
+distfiles="https://salsa.debian.org/python-debian-team/python-debian/-/archive/${version}/python-debian-${version}.tar.gz"
+checksum=f7f726ffd678f9ce2e099b6b036f63c1793da4898d5de1fcec31cab2630f8096
diff --git a/srcpkgs/python3-debian/update b/srcpkgs/python3-debian/update
new file mode 100644
index 000000000000..5cff7f2cd03c
--- /dev/null
+++ b/srcpkgs/python3-debian/update
@@ -0,0 +1,2 @@
+pkgname=python-debian
+site=https://salsa.debian.org/python-debian-team/python-debian/tags
From 053e589dd57cd3e8183831f29a7aef912ad52935 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:04 +0300
Subject: [PATCH 2/5] New package: python3-boolean.py-3.8
---
srcpkgs/python3-boolean.py/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-boolean.py/template
diff --git a/srcpkgs/python3-boolean.py/template b/srcpkgs/python3-boolean.py/template
new file mode 100644
index 000000000000..78e6eba59d18
--- /dev/null
+++ b/srcpkgs/python3-boolean.py/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-boolean.py'
+pkgname=python3-boolean.py
+version=3.8
+revision=1
+wrksrc="boolean.py-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+short_desc="Small library implementing a boolean algebra"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-2-Clause"
+homepage="https://github.com/bastikr/boolean.py"
+changelog="https://raw.githubusercontent.com/bastikr/boolean.py/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/b/boolean.py/boolean.py-${version}.tar.gz"
+checksum=cc24e20f985d60cd4a3a5a1c0956dd12611159d32a75081dabd0c9ab981acaa4
+
+post_install() {
+ rm "${DESTDIR}/${py3_sitelib}/boolean/test_boolean.py"
+ vlicense LICENSE.txt
+}
From bef765e0c4ea139a5a6ab29aa9fd99275f9d053a Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:25 +0300
Subject: [PATCH 3/5] New package: python3-binaryornot-0.4.4
---
.../patches/0001-fix-failing-test.patch | 22 +++++++++++++++++++
srcpkgs/python3-binaryornot/template | 20 +++++++++++++++++
2 files changed, 42 insertions(+)
create mode 100644 srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
create mode 100644 srcpkgs/python3-binaryornot/template
diff --git a/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
new file mode 100644
index 000000000000..2070485b6a0d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/patches/0001-fix-failing-test.patch
@@ -0,0 +1,22 @@
+From 38dee57986c6679d9936a1da6f6c8182da3734f8 Mon Sep 17 00:00:00 2001
+From: Greg <gregobinna@gmail.com>
+Date: Sat, 10 Aug 2019 15:10:33 +0000
+Subject: [PATCH] fix failing test
+
+---
+ tests/test_check.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/test_check.py b/tests/test_check.py
+index 1ea31a4..f800583 100755
+--- a/tests/test_check.py
++++ b/tests/test_check.py
+@@ -216,7 +216,7 @@ def bytes_in_file(data):
+
+
+ class TestDetectionProperties(unittest.TestCase):
+- @given(binary(average_size=512))
++ @given(binary(max_size=512))
+ def test_never_crashes(self, data):
+ with bytes_in_file(data) as f:
+ is_binary(f)
diff --git a/srcpkgs/python3-binaryornot/template b/srcpkgs/python3-binaryornot/template
new file mode 100644
index 000000000000..56b30d88215d
--- /dev/null
+++ b/srcpkgs/python3-binaryornot/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-binaryornot'
+pkgname=python3-binaryornot
+version=0.4.4
+revision=1
+wrksrc="binaryornot-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-chardet"
+checkdepends="python3-hypothesis $depends"
+short_desc="Pure Python package to check if a file is binary or text"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/audreyfeldroy/binaryornot"
+changelog="https://raw.githubusercontent.com/audreyfeldroy/binaryornot/master/HISTORY.rst"
+distfiles="${PYPI_SITE}/b/binaryornot/binaryornot-${version}.tar.gz"
+checksum=359501dfc9d40632edc9fac890e19542db1a287bbcfa58175b66658392018061
+
+post_install() {
+ vlicense LICENSE
+}
From 8b028274480d50549883f25b21b7a9a79abea922 Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:05:50 +0300
Subject: [PATCH 4/5] New package: python3-license-expression-21.6.14
---
srcpkgs/python3-license-expression/template | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
create mode 100644 srcpkgs/python3-license-expression/template
diff --git a/srcpkgs/python3-license-expression/template b/srcpkgs/python3-license-expression/template
new file mode 100644
index 000000000000..32e6b2df88a6
--- /dev/null
+++ b/srcpkgs/python3-license-expression/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-license-expression'
+pkgname=python3-license-expression
+version=21.6.14
+revision=1
+wrksrc="license-expression-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+depends="python3-boolean.py"
+checkdepends="python3-pytest $depends"
+short_desc="Library to parse, normalize and compare license expressions"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/nexB/license-expression"
+changelog="https://raw.githubusercontent.com/nexB/license-expression/master/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/l/license-expression/license-expression-${version}.tar.gz"
+checksum=9de87a427c9a449eee7913472fb9ed03b63036295547369fdbf95f76a8b924b2
From 47e2679acf2e43ca424b25a4f9d9ffde31dd6c5b Mon Sep 17 00:00:00 2001
From: k4leg <python.bogdan@gmail.com>
Date: Wed, 1 Sep 2021 21:06:09 +0300
Subject: [PATCH 5/5] New package: reuse-0.13.0
---
srcpkgs/reuse/template | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
create mode 100644 srcpkgs/reuse/template
diff --git a/srcpkgs/reuse/template b/srcpkgs/reuse/template
new file mode 100644
index 000000000000..fc605fd20264
--- /dev/null
+++ b/srcpkgs/reuse/template
@@ -0,0 +1,18 @@
+# Template file for 'reuse'
+pkgname=reuse
+version=0.13.0
+revision=1
+build_style=python3-module
+make_check_args="--deselect tests/test_lint.py::test_lint_read_errors
+ --deselect tests/test_report.py::test_generate_project_report_read_error"
+hostmakedepends="python3-setuptools python3-setuptools_scm gettext"
+depends="python3-binaryornot python3-boolean.py python3-debian python3-Jinja2
+ python3-license-expression python3-requests"
+checkdepends="python3-pytest $depends"
+short_desc="Helper tool for compliance with REUSE Specification"
+maintainer="k4leg <python.bogdan@gmail.com>"
+license="GPL-3.0-or-later, CC0-1.0, Apache-2.0"
+homepage="https://reuse.software"
+changelog="https://raw.githubusercontent.com/fsfe/reuse-tool/master/CHANGELOG.md"
+distfiles="${PYPI_SITE}/r/reuse/reuse-${version}.tar.gz"
+checksum=89c87bd49308c8059cc36f8116872d73dc6e5788a29af8869be6532202bff801
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PR PATCH] [Merged]: New package: reuse-0.13.0
2021-08-29 18:12 [PR PATCH] New package: reuse-0.13.0 k4leg
` (35 preceding siblings ...)
2021-09-05 11:43 ` [PR PATCH] [Updated] " k4leg
@ 2021-09-17 17:10 ` Chocimier
36 siblings, 0 replies; 38+ messages in thread
From: Chocimier @ 2021-09-17 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1483 bytes --]
There's a merged pull request on the void-packages repository
New package: reuse-0.13.0
https://github.com/void-linux/void-packages/pull/32746
Description:
<!-- Mark items with [x] where applicable -->
See <https://reuse.software> for more info.
#### General
- [x] 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.)
- [ ] 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
-->
^ permalink raw reply [flat|nested] 38+ messages in thread