Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] beets: update to 1.5.0.
@ 2021-10-06 23:09 TinfoilSubmarine
  2021-10-07  0:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (26 more replies)
  0 siblings, 27 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-06 23:09 UTC (permalink / raw)
  To: ml

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

There is a new pull request by TinfoilSubmarine against master on the void-packages repository

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From ef3aedd739e4054aa402df8d9bccd2c325d979ec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/11] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..fc0321f9f11c
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 1e87d795d7c5bda542daf1997af7667506b80e09 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/11] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..48376ff7f523
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 02cca6f1bde2cba3c47d8357e5286246b2894a72 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/11] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From f4ca5cf09f34117f487bc25dd2ba9543e2491d9d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/11] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..e08d18278584
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From 43ea151509b588554145a3bd04ecd444afbcfbb8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/11] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From f1435a5d8b2b91365d0e867d668fb87e47340a6b Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/11] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From a1a9363769bf51a87d55c3cd2b2305bbfd4a21e8 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/11] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 96f5b3c9113360e9f9cbf57af23dad41ab93c4f1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/11] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 76fda53c3b4ac185602e2cc16c39615937abd4d1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/11] New package: python3-reflink-0.2.1

---
 srcpkgs/python3-reflink/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..c941d1282192
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-pip python3-wheel"
+makedepends="python3-devel"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From f8683f6d3b4c02891f42b36e2ec2fd3d13691db4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/11] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..8d9be051130d
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="python3-pytest python3-mutagen python3-six"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 70bdf22511b44c227113e68fc3aeba6a4fd1dc7f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 11/11] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 19 +++++----
 2 files changed, 9 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 8dfb44bf88ad..d7e5641e3631 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,21 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=4
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
@ 2021-10-07  0:04 ` TinfoilSubmarine
  2021-10-07  0:29 ` TinfoilSubmarine
                   ` (25 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07  0:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From ef3aedd739e4054aa402df8d9bccd2c325d979ec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/11] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..fc0321f9f11c
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 844ea41aeb2c2ace6594150b14f9f4d74a2bacc4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/11] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 7194256a191e8dc7161eeb3cab803d19486a0cbe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/11] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From e2552fe4b2837ab3f1797fa7ec21f46d3b9100e3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/11] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..e08d18278584
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From 10748eca88b3418d329f3b4e39abe6fbf5321a7c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/11] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 555b6f9f9f766a596c4117f919cd7b7d758842b3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/11] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 11f4bdc554456e10d732a348bc1197506a751dd0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/11] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 2cc68f8a3c0c2811275b73dd1e519eb750171e7d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/11] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 40957a161a0d2bf5b9da16a0afdebec10b1eef87 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/11] New package: python3-reflink-0.2.1

---
 srcpkgs/python3-reflink/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..57393e6d4875
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-pip python3-wheel"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 564f4fd5ccad5a193c0b81b47b30eab669ebe168 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/11] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..8d9be051130d
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="python3-pytest python3-mutagen python3-six"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From edeae316172bc4b69c3a115475aea6bd457a37f2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 11/11] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 19 +++++----
 2 files changed, 9 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 8dfb44bf88ad..d7e5641e3631 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,21 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=4
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
  2021-10-07  0:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-07  0:29 ` TinfoilSubmarine
  2021-10-07  0:44 ` TinfoilSubmarine
                   ` (24 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07  0:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From ef3aedd739e4054aa402df8d9bccd2c325d979ec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/11] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..fc0321f9f11c
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 844ea41aeb2c2ace6594150b14f9f4d74a2bacc4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/11] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 7194256a191e8dc7161eeb3cab803d19486a0cbe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/11] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From e2552fe4b2837ab3f1797fa7ec21f46d3b9100e3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/11] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..e08d18278584
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From 10748eca88b3418d329f3b4e39abe6fbf5321a7c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/11] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 555b6f9f9f766a596c4117f919cd7b7d758842b3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/11] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 11f4bdc554456e10d732a348bc1197506a751dd0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/11] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 2cc68f8a3c0c2811275b73dd1e519eb750171e7d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/11] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From cc0017bbcd686608f3ce102a76217da52f2823a0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/11] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From f278feed0ab76dddc85678fd047ed64deb4dcace Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/11] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..8d9be051130d
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="python3-pytest python3-mutagen python3-six"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 6de03b962c43cbdd80bcfc016791c9603f551624 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 11/11] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 19 +++++----
 2 files changed, 9 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 8dfb44bf88ad..d7e5641e3631 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,21 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=4
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
  2021-10-07  0:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
  2021-10-07  0:29 ` TinfoilSubmarine
@ 2021-10-07  0:44 ` TinfoilSubmarine
  2021-10-07  0:45 ` TinfoilSubmarine
                   ` (23 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07  0:44 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-937352849

Comment:
This is really bizarre. x86_64, x86_64-musl, and aarch64 are successfully building on my machine (with passing check/test).

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (2 preceding siblings ...)
  2021-10-07  0:44 ` TinfoilSubmarine
@ 2021-10-07  0:45 ` TinfoilSubmarine
  2021-10-07  0:45 ` TinfoilSubmarine
                   ` (22 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07  0:45 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-937352964

Comment:
This is really bizarre. x86_64, x86_64-musl, and aarch64 are successfully building on my machine (with passing check/test).

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (3 preceding siblings ...)
  2021-10-07  0:45 ` TinfoilSubmarine
@ 2021-10-07  0:45 ` TinfoilSubmarine
  2021-10-07  1:44 ` ericonr
                   ` (21 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07  0:45 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-937352964

Comment:
This is really bizarre. x86_64, x86_64-musl, and aarch64 are successfully building on my machine (with passing check/test).

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (4 preceding siblings ...)
  2021-10-07  0:45 ` TinfoilSubmarine
@ 2021-10-07  1:44 ` ericonr
  2021-10-07  2:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (20 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-10-07  1:44 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-937377067

Comment:
The failing error seems to be checking for some permission related stuff, but CI runs as root. Add `make_check=ci-skip # tests don't work as root` to the failing package and try again.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (5 preceding siblings ...)
  2021-10-07  1:44 ` ericonr
@ 2021-10-07  2:44 ` TinfoilSubmarine
  2021-10-07 12:34 ` TinfoilSubmarine
                   ` (19 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07  2:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From ef3aedd739e4054aa402df8d9bccd2c325d979ec Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/11] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..fc0321f9f11c
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 844ea41aeb2c2ace6594150b14f9f4d74a2bacc4 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/11] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 7194256a191e8dc7161eeb3cab803d19486a0cbe Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/11] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From 0fbe474d305c16e379f292d84cdbcba6640d6487 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/11] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..ca1f05393d44
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-cffi"
+makedepends="python3-devel"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From 9651298c60550055614558f58654979a64a1f74c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/11] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From ba44368a15690321469f9afb0f60f553e543872e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/11] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 0b01a444a56165ed8c683534f5a28ad315775a4e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/11] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From cab2e96241b5ae79ae2757f683751de4d582f76e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/11] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 72e6e3c9433ea0824b46394aafaea05fe1a74137 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/11] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From f8527c233c1f9a979b4814a7c92685ff2f9be278 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/11] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..8d9be051130d
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="python3-pytest python3-mutagen python3-six"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From e6bac6c0c4bbed98085e0b4a34986fb2297b89de Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 11/11] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 8dfb44bf88ad..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=4
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (6 preceding siblings ...)
  2021-10-07  2:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-07 12:34 ` TinfoilSubmarine
  2021-10-07 12:34 ` TinfoilSubmarine
                   ` (18 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07 12:34 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From 62df0a9c4d1253179bd43e066f09c298ede3db27 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/11] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..fc0321f9f11c
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 6acf6c7f08c595d2befd6bd263e572366432d9eb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/11] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 0fbd02d0c865e921a0d808891486500e6f017241 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/11] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From c3c3ad4734a4155a7b1172940d6ca314d9fc662e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/11] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..ca1f05393d44
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-cffi"
+makedepends="python3-devel"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From e400bd8bc33f40ee7da6971b7830dec822cf4c70 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/11] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From c91e05794b0e43fced86ad3bfc4ac0933c995901 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/11] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From fc9cd4120fa74730373dfd12e3d7b23a0a29de37 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/11] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 39ba4eacb4e52613aadb2812779a2263e500da86 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/11] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 8209d703cbb68616b09d91e707424949885eec50 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/11] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From ee707e6146ba5eb2c0875db34cfd3734de0076c3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/11] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..8d9be051130d
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="python3-pytest python3-mutagen python3-six"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 13511713d8a97ebd577fce77e48a984c32667a22 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 11/11] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index 8dfb44bf88ad..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=4
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (7 preceding siblings ...)
  2021-10-07 12:34 ` TinfoilSubmarine
@ 2021-10-07 12:34 ` TinfoilSubmarine
  2021-10-08 14:40 ` ericonr
                   ` (17 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-07 12:34 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-937749170

Comment:
Last CI run failed due to not being able to access repo. Rebased on master to trigger new run. Hopefully should run with no issues now.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (8 preceding siblings ...)
  2021-10-07 12:34 ` TinfoilSubmarine
@ 2021-10-08 14:40 ` ericonr
  2021-10-12 14:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (16 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-10-08 14:40 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-938696465

Comment:
This PR will definitely wait until the python 3.10 update. Please ping me if I forget.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (9 preceding siblings ...)
  2021-10-08 14:40 ` ericonr
@ 2021-10-12 14:00 ` TinfoilSubmarine
  2021-10-12 14:01 ` TinfoilSubmarine
                   ` (15 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-12 14:00 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From b0c65a5a48ffee4e56eea9a68f7121e673ed4f31 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/12] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..fc0321f9f11c
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From c2b3ff3266e03c042385f6297b5bf8a8b5be162d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/12] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 2ba05a478564cf50e0f9900782db22a98cafc406 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/12] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From be34f6d85daf651cef46c822ab92185f28d554e3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/12] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..ca1f05393d44
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-cffi"
+makedepends="python3-devel"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From fc6a7f27db7da4c4965f62c2ed063509d718724a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/12] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From fd094a44fa89c90b211c593b10f3a30360709aa1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/12] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From dfcfdffd4c3d8a70b587bf36ff62d419204647bf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/12] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 1eaed0eae736624699c9468e3e8c2393fdc3571e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/12] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 84b9e6b55af49b8288344c573c8d9ae371fb7157 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/12] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From e577a22209681ddb936663c025b7a7b0aaef56f9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/12] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..8d9be051130d
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="python3-pytest python3-mutagen python3-six"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 9a317990bfa684921841700322643a05edf1aa3d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 09:50:48 -0400
Subject: [PATCH 11/12] python3-jellyfish: update to 0.8.2.

---
 srcpkgs/python3-jellyfish/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..51051e1ea4e2 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,20 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.2
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=a499741401512d05bbd3556e448e960bc908eba3879fb73d450e8e91566a030b
+# uses tox but no test defined for py3.10
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 1279622102b0bf19832d2f27c43fd67475dee87d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 12/12] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (10 preceding siblings ...)
  2021-10-12 14:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-12 14:01 ` TinfoilSubmarine
  2021-10-12 19:50 ` [PR REVIEW] " ericonr
                   ` (14 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-12 14:01 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-941041632

Comment:
Bumped `python3-jellyfish` to latest version to fix deprecation errors.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (11 preceding siblings ...)
  2021-10-12 14:01 ` TinfoilSubmarine
@ 2021-10-12 19:50 ` ericonr
  2021-10-12 19:50 ` ericonr
                   ` (13 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-10-12 19:50 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r727442018

Comment:
Shouldn't it depend on brotli? Assuming it uses ctypes and such.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (12 preceding siblings ...)
  2021-10-12 19:50 ` [PR REVIEW] " ericonr
@ 2021-10-12 19:50 ` ericonr
  2021-10-12 19:50 ` ericonr
                   ` (12 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-10-12 19:50 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r727442527

Comment:
```suggestion
checkdepends="${depends} python3-pytest"
```

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (13 preceding siblings ...)
  2021-10-12 19:50 ` ericonr
@ 2021-10-12 19:50 ` ericonr
  2021-10-12 20:13 ` TinfoilSubmarine
                   ` (11 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-10-12 19:50 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r727442935

Comment:
Wrong desc

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (14 preceding siblings ...)
  2021-10-12 19:50 ` ericonr
@ 2021-10-12 20:13 ` TinfoilSubmarine
  2021-10-12 20:16 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (10 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-12 20:13 UTC (permalink / raw)
  To: ml

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r727464003

Comment:
No, it looks like it bundles it in the .so. I just tested to make sure and I can compress and decompress without having brotli installed.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (15 preceding siblings ...)
  2021-10-12 20:13 ` TinfoilSubmarine
@ 2021-10-12 20:16 ` TinfoilSubmarine
  2021-10-13  0:53 ` [PR REVIEW] " ericonr
                   ` (9 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-12 20:16 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From ebbe3e1a4b50b3b872fd16f638cb5057a169344c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/12] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..9bbc52b7fc95
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 8a3f8e4acb2a8a4e5f0a1cfd5657fba7cd5f4ec9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/12] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From afa4d0a141742d9a27089f89bc84d1d3e476a603 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/12] New package: python3-multivolumefile-0.2.2

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..f7677060d262
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.2
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=e6fcb53ac617866179d1cf7a7cf245560bcb82fee37eb9951b3a814596e28648

From f98357f82763548f66c14bfa3a6aadc55c307905 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/12] New package: python3-bcj-cffi-0.5.1

---
 srcpkgs/python3-bcj-cffi/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-bcj-cffi/template

diff --git a/srcpkgs/python3-bcj-cffi/template b/srcpkgs/python3-bcj-cffi/template
new file mode 100644
index 000000000000..ca1f05393d44
--- /dev/null
+++ b/srcpkgs/python3-bcj-cffi/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-bcj-cffi'
+pkgname=python3-bcj-cffi
+version=0.5.1
+revision=1
+wrksrc="bcj-cffi-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-setuptools_scm python3-cffi"
+makedepends="python3-devel"
+depends="python3-cffi"
+checkdepends="python3-pytest python3-pytest-cov"
+short_desc="Python module of BCJ: Branch/Call/Jump conversion filter by CFFI"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/bcj-cffi"
+distfiles="${PYPI_SITE}/b/bcj-cffi/bcj-cffi-${version}.tar.gz"
+checksum=2b4a5d1252e72bea5a5eb1e51650435825299b0e87c25ddfd21a1623514fd0cc

From 40187b7a407eaa4141f6fdd9780bb697a2b56820 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/12] New package: python3-pyppmd-0.17.0

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..adef4a1a6f4c
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.0
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=c949c5917a2e1b0a0b17d22d9e1596743b0df9465edf2b1d340d12ab5993bce8
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 614343bed40921a5ff3687b5e84e88afa3cae23d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/12] New package: python3-py7zr-0.16.1

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..f5f6e1266686
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.1
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-bcj-cffi
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=0ab402f73fc8cc41f2a5523436ae53dec6ff612597d9168ed80cfa1574d27fe0
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 73ffb63c1e12d939ecb5a5df0c5d2c91a250a4b1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/12] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 4c7c8f336bbd9914863bc038cdd7aa535bbd06d7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/12] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 0e6021c642e6e57d7176d11a43e4fdabba774443 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/12] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From a12822b923398c805b88f7644bb82a70ba58bad9 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/12] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..62b47885bba8
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="${depends} python3-pytest"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From e8696e6ba944c2b9016372bdce6edcc29e9bfe0e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 09:50:48 -0400
Subject: [PATCH 11/12] python3-jellyfish: update to 0.8.2.

---
 srcpkgs/python3-jellyfish/template | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..51051e1ea4e2 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,20 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.2
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=a499741401512d05bbd3556e448e960bc908eba3879fb73d450e8e91566a030b
+# uses tox but no test defined for py3.10
+make_check=no
 
 post_install() {
 	vlicense LICENSE

From 7cf8538b5ae999dd14c9bef1de46fef6ef100d80 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 12/12] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (16 preceding siblings ...)
  2021-10-12 20:16 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-13  0:53 ` ericonr
  2021-10-13 13:23 ` TinfoilSubmarine
                   ` (8 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: ericonr @ 2021-10-13  0:53 UTC (permalink / raw)
  To: ml

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r727617565

Comment:
Any idea if we can make it use system brotli?

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (17 preceding siblings ...)
  2021-10-13  0:53 ` [PR REVIEW] " ericonr
@ 2021-10-13 13:23 ` TinfoilSubmarine
  2021-10-21 18:46 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (7 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-13 13:23 UTC (permalink / raw)
  To: ml

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r728058485

Comment:
I'm not seeing anything. I did see there is an API-identical CFFI module (https://github.com/python-hyper/brotlicffi), but nothing other than that.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (18 preceding siblings ...)
  2021-10-13 13:23 ` TinfoilSubmarine
@ 2021-10-21 18:46 ` TinfoilSubmarine
  2021-10-21 18:47 ` TinfoilSubmarine
                   ` (6 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 18:46 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From 295c3abe249cf30a41160c17a654d3bdce43b77f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/12] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..9bbc52b7fc95
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 560f73957c587d0f95cb8f1b3165d04c8cda0061 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/12] New package: python3-Brotli-1.0.9

---
 srcpkgs/python3-Brotli/template | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..9eabd2a26b9d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,21 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="Brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="${PYPI_SITE}/B/Brotli/Brotli-${version}.zip"
+checksum=4d1b810aa0ed773f81dceda2cc7b403d01057458730e309856356d4ef4188438
+# no tests specified
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 8e9d26f1a746f073cbf2106b12e30d02b0c975a3 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/12] New package: python3-multivolumefile-0.2.3

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..4aa4ee9c4577
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.3
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=a0648d0aafbc96e59198d5c17e9acad7eb531abea51035d08ce8060dcad709d6

From f65aa09abee0bd03b635a8a3b3200e8cac6e7cfc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/12] New package: python3-pybcj-0.5.0

---
 srcpkgs/python3-pybcj/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-pybcj/template

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
new file mode 100644
index 000000000000..24e9869999e0
--- /dev/null
+++ b/srcpkgs/python3-pybcj/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pybcj'
+pkgname=python3-pybcj
+version=0.5.0
+revision=1
+wrksrc="pybcj-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+#checkdepends="python3-pytest python3-pytest-cov"
+short_desc="BCJ(Branch-Call-Jump) filter for python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/pybcj"
+distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
+checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f

From 267236fc23883aca564b401b79ae47c0f61daa69 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/12] New package: python3-pyppmd-0.17.1

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..6449ad14345f
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.1
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=ebc65d393d58b5463fdfbdf9b27e51b6aef9a9142052a50685a5dfdba91f5808
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 62eb50da49db7f67cfd88b9e36e9bd7fc6c96417 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/12] New package: python3-py7zr-0.16.2

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..674347e85cc9
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.2
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=e741f0271ebb12551e4a4b57bf01fca226e7136ff301d15c083cd262f8c4a0d6
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From e7f6572e74a4d9638b6521c255fd7b3fa89c2b1a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/12] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 7d0631da61d21f1a501c7b358a212a91ff9264f7 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/12] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From b8b0d787e53b061fdee54040001022dbe36e306a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/12] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 0a968ad4395714dbdc7c378a8f405a7a8d61cebf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/12] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..62b47885bba8
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="${depends} python3-pytest"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 72f2cc01e1d8baa6c18de08b09f5b63114de0e0a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 09:50:48 -0400
Subject: [PATCH 11/12] python3-jellyfish: update to 0.8.8.

---
 srcpkgs/python3-jellyfish/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..6a5d65937649 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,24 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.8
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)"
+	python3 -m pytest "${PYTHONPATH}/jellyfish/test.py"
+}
 
 post_install() {
 	vlicense LICENSE

From 6f8c8ddd18bf05dc0955dc30fec2508e0fc2e3fc Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 12/12] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (19 preceding siblings ...)
  2021-10-21 18:46 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-21 18:47 ` TinfoilSubmarine
  2021-10-21 20:48 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (5 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 18:47 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-948905873

Comment:
Bumped several dependencies to latest version. One switched from depending on `bcj-cffi` to `pybcj` so I updated accordingly. Also got `jellyfish` tests working.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (20 preceding siblings ...)
  2021-10-21 18:47 ` TinfoilSubmarine
@ 2021-10-21 20:48 ` TinfoilSubmarine
  2021-10-21 20:55 ` [PR REVIEW] " TinfoilSubmarine
                   ` (4 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 20:48 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From 295c3abe249cf30a41160c17a654d3bdce43b77f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/12] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..9bbc52b7fc95
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 5beedc50af7e4a2df25fef60a5f771f42faa5879 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/12] New package: python3-Brotli-1.0.9

---
 .../patches/use-system-brotli.patch           | 119 ++++++++++++++++++
 srcpkgs/python3-Brotli/template               |  19 +++
 2 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/patches/use-system-brotli.patch
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
new file mode 100644
index 000000000000..c17b2c5975fc
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
@@ -0,0 +1,119 @@
+diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py
+index 104e654..6cf12b0 100644
+--- a/python/tests/_test_utils.py
++++ b/python/tests/_test_utils.py
+@@ -36,10 +36,7 @@ TESTDATA_DIR = os.path.join(test_dir, 'testdata')
+ 
+ TESTDATA_FILES = [
+     'empty',  # Empty file
+-    '10x10y',  # Small text
+-    'alice29.txt',  # Large text
+-    'random_org_10k.bin',  # Small data
+-    'mapsdatazrh',  # Large data
++    'ukkonooa',  # Small text
+ ]
+ 
+ TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES]
+diff --git a/setup.py b/setup.py
+index 25626ec..fdf27a2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -181,93 +181,18 @@ EXT_MODULES = [
+         '_brotli',
+         sources=[
+             'python/_brotli.cc',
+-            'c/common/constants.c',
+-            'c/common/context.c',
+-            'c/common/dictionary.c',
+-            'c/common/platform.c',
+-            'c/common/transform.c',
+-            'c/dec/bit_reader.c',
+-            'c/dec/decode.c',
+-            'c/dec/huffman.c',
+-            'c/dec/state.c',
+-            'c/enc/backward_references.c',
+-            'c/enc/backward_references_hq.c',
+-            'c/enc/bit_cost.c',
+-            'c/enc/block_splitter.c',
+-            'c/enc/brotli_bit_stream.c',
+-            'c/enc/cluster.c',
+-            'c/enc/command.c',
+-            'c/enc/compress_fragment.c',
+-            'c/enc/compress_fragment_two_pass.c',
+-            'c/enc/dictionary_hash.c',
+-            'c/enc/encode.c',
+-            'c/enc/encoder_dict.c',
+-            'c/enc/entropy_encode.c',
+-            'c/enc/fast_log.c',
+-            'c/enc/histogram.c',
+-            'c/enc/literal_cost.c',
+-            'c/enc/memory.c',
+-            'c/enc/metablock.c',
+-            'c/enc/static_dict.c',
+-            'c/enc/utf8_util.c',
+         ],
+         depends=[
+-            'c/common/constants.h',
+-            'c/common/context.h',
+-            'c/common/dictionary.h',
+-            'c/common/platform.h',
+-            'c/common/transform.h',
+             'c/common/version.h',
+-            'c/dec/bit_reader.h',
+-            'c/dec/huffman.h',
+-            'c/dec/prefix.h',
+-            'c/dec/state.h',
+-            'c/enc/backward_references.h',
+-            'c/enc/backward_references_hq.h',
+-            'c/enc/backward_references_inc.h',
+-            'c/enc/bit_cost.h',
+-            'c/enc/bit_cost_inc.h',
+-            'c/enc/block_encoder_inc.h',
+-            'c/enc/block_splitter.h',
+-            'c/enc/block_splitter_inc.h',
+-            'c/enc/brotli_bit_stream.h',
+-            'c/enc/cluster.h',
+-            'c/enc/cluster_inc.h',
+-            'c/enc/command.h',
+-            'c/enc/compress_fragment.h',
+-            'c/enc/compress_fragment_two_pass.h',
+-            'c/enc/dictionary_hash.h',
+-            'c/enc/encoder_dict.h',
+-            'c/enc/entropy_encode.h',
+-            'c/enc/entropy_encode_static.h',
+-            'c/enc/fast_log.h',
+-            'c/enc/find_match_length.h',
+-            'c/enc/hash.h',
+-            'c/enc/hash_composite_inc.h',
+-            'c/enc/hash_forgetful_chain_inc.h',
+-            'c/enc/hash_longest_match64_inc.h',
+-            'c/enc/hash_longest_match_inc.h',
+-            'c/enc/hash_longest_match_quickly_inc.h',
+-            'c/enc/hash_rolling_inc.h',
+-            'c/enc/hash_to_binary_tree_inc.h',
+-            'c/enc/histogram.h',
+-            'c/enc/histogram_inc.h',
+-            'c/enc/literal_cost.h',
+-            'c/enc/memory.h',
+-            'c/enc/metablock.h',
+-            'c/enc/metablock_inc.h',
+-            'c/enc/params.h',
+-            'c/enc/prefix.h',
+-            'c/enc/quality.h',
+-            'c/enc/ringbuffer.h',
+-            'c/enc/static_dict.h',
+-            'c/enc/static_dict_lut.h',
+-            'c/enc/utf8_util.h',
+-            'c/enc/write_bits.h',
+         ],
+         include_dirs=[
+             'c/include',
+         ],
++        libraries=[
++            'brotlicommon',
++            'brotlidec',
++            'brotlienc',
++        ],
+         language='c++'),
+ ]
+ 
diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..3f4cfafc3f7d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel brotli-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz"
+checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+
+post_install() {
+	vlicense LICENSE
+}

From 8688d65e99cc40f4986ccc690affaa8a8586c2ed Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/12] New package: python3-multivolumefile-0.2.3

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..4aa4ee9c4577
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.3
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=a0648d0aafbc96e59198d5c17e9acad7eb531abea51035d08ce8060dcad709d6

From 070d8b671ad05ca640ba3ee1d488b0874a0a994e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/12] New package: python3-pybcj-0.5.0

---
 srcpkgs/python3-pybcj/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-pybcj/template

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
new file mode 100644
index 000000000000..24e9869999e0
--- /dev/null
+++ b/srcpkgs/python3-pybcj/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pybcj'
+pkgname=python3-pybcj
+version=0.5.0
+revision=1
+wrksrc="pybcj-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+#checkdepends="python3-pytest python3-pytest-cov"
+short_desc="BCJ(Branch-Call-Jump) filter for python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/pybcj"
+distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
+checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f

From 7a58d29ac62e85cca9fbc8e9bf5b5c56f41fd029 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/12] New package: python3-pyppmd-0.17.1

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..6449ad14345f
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.1
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=ebc65d393d58b5463fdfbdf9b27e51b6aef9a9142052a50685a5dfdba91f5808
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 334650bcb8ec110a66b2199131f9bbc8d7eb4b78 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/12] New package: python3-py7zr-0.16.2

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..674347e85cc9
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.2
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=e741f0271ebb12551e4a4b57bf01fca226e7136ff301d15c083cd262f8c4a0d6
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From b023a42d89893c212370d939bf1c1755c06aefcf Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/12] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From ad064ac1baf36dab0a6b2633a74f11673e623fc2 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/12] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From 255ba85bdefa3a8a9cf176f8a690d5a8f2395001 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/12] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 711a79e65b1c8f730ae26f667dd4d069374e35cb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/12] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..62b47885bba8
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="${depends} python3-pytest"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 2fd05f630ac638f76cdad281ab13347c425c5860 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 09:50:48 -0400
Subject: [PATCH 11/12] python3-jellyfish: update to 0.8.8.

---
 srcpkgs/python3-jellyfish/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..6a5d65937649 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,24 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.8
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)"
+	python3 -m pytest "${PYTHONPATH}/jellyfish/test.py"
+}
 
 post_install() {
 	vlicense LICENSE

From 959efdc479bdf7960d7699f8ce8d2780699c2cd0 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 12/12] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR REVIEW] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (21 preceding siblings ...)
  2021-10-21 20:48 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-21 20:55 ` TinfoilSubmarine
  2021-10-21 21:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
                   ` (3 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 20:55 UTC (permalink / raw)
  To: ml

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

New review comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#discussion_r734039463

Comment:
Just pushed a patch for it that makes it link system brotli.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (22 preceding siblings ...)
  2021-10-21 20:55 ` [PR REVIEW] " TinfoilSubmarine
@ 2021-10-21 21:04 ` TinfoilSubmarine
  2021-10-21 21:05 ` TinfoilSubmarine
                   ` (2 subsequent siblings)
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 21:04 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From 295c3abe249cf30a41160c17a654d3bdce43b77f Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/12] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..9bbc52b7fc95
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+checkdepends="python3-pytest"
+short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From 6052f524f17a93418dd96ebf59fe48cbee165a07 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/12] New package: python3-Brotli-1.0.9

---
 .../patches/missing-test-cases.patch          |  16 +++
 .../patches/use-system-brotli.patch           | 103 ++++++++++++++++++
 srcpkgs/python3-Brotli/template               |  19 ++++
 3 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/patches/missing-test-cases.patch
 create mode 100644 srcpkgs/python3-Brotli/patches/use-system-brotli.patch
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch
new file mode 100644
index 000000000000..cbefb7557a2d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch
@@ -0,0 +1,16 @@
+diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py
+index 104e654..6cf12b0 100644
+--- a/python/tests/_test_utils.py
++++ b/python/tests/_test_utils.py
+@@ -36,10 +36,7 @@ TESTDATA_DIR = os.path.join(test_dir, 'testdata')
+ 
+ TESTDATA_FILES = [
+     'empty',  # Empty file
+-    '10x10y',  # Small text
+-    'alice29.txt',  # Large text
+-    'random_org_10k.bin',  # Small data
+-    'mapsdatazrh',  # Large data
++    'ukkonooa',  # Small text
+ ]
+ 
+ TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES]
diff --git a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
new file mode 100644
index 000000000000..d24964295cb0
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
@@ -0,0 +1,103 @@
+diff --git a/setup.py b/setup.py
+index 25626ec..fdf27a2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -181,93 +181,18 @@ EXT_MODULES = [
+         '_brotli',
+         sources=[
+             'python/_brotli.cc',
+-            'c/common/constants.c',
+-            'c/common/context.c',
+-            'c/common/dictionary.c',
+-            'c/common/platform.c',
+-            'c/common/transform.c',
+-            'c/dec/bit_reader.c',
+-            'c/dec/decode.c',
+-            'c/dec/huffman.c',
+-            'c/dec/state.c',
+-            'c/enc/backward_references.c',
+-            'c/enc/backward_references_hq.c',
+-            'c/enc/bit_cost.c',
+-            'c/enc/block_splitter.c',
+-            'c/enc/brotli_bit_stream.c',
+-            'c/enc/cluster.c',
+-            'c/enc/command.c',
+-            'c/enc/compress_fragment.c',
+-            'c/enc/compress_fragment_two_pass.c',
+-            'c/enc/dictionary_hash.c',
+-            'c/enc/encode.c',
+-            'c/enc/encoder_dict.c',
+-            'c/enc/entropy_encode.c',
+-            'c/enc/fast_log.c',
+-            'c/enc/histogram.c',
+-            'c/enc/literal_cost.c',
+-            'c/enc/memory.c',
+-            'c/enc/metablock.c',
+-            'c/enc/static_dict.c',
+-            'c/enc/utf8_util.c',
+         ],
+         depends=[
+-            'c/common/constants.h',
+-            'c/common/context.h',
+-            'c/common/dictionary.h',
+-            'c/common/platform.h',
+-            'c/common/transform.h',
+             'c/common/version.h',
+-            'c/dec/bit_reader.h',
+-            'c/dec/huffman.h',
+-            'c/dec/prefix.h',
+-            'c/dec/state.h',
+-            'c/enc/backward_references.h',
+-            'c/enc/backward_references_hq.h',
+-            'c/enc/backward_references_inc.h',
+-            'c/enc/bit_cost.h',
+-            'c/enc/bit_cost_inc.h',
+-            'c/enc/block_encoder_inc.h',
+-            'c/enc/block_splitter.h',
+-            'c/enc/block_splitter_inc.h',
+-            'c/enc/brotli_bit_stream.h',
+-            'c/enc/cluster.h',
+-            'c/enc/cluster_inc.h',
+-            'c/enc/command.h',
+-            'c/enc/compress_fragment.h',
+-            'c/enc/compress_fragment_two_pass.h',
+-            'c/enc/dictionary_hash.h',
+-            'c/enc/encoder_dict.h',
+-            'c/enc/entropy_encode.h',
+-            'c/enc/entropy_encode_static.h',
+-            'c/enc/fast_log.h',
+-            'c/enc/find_match_length.h',
+-            'c/enc/hash.h',
+-            'c/enc/hash_composite_inc.h',
+-            'c/enc/hash_forgetful_chain_inc.h',
+-            'c/enc/hash_longest_match64_inc.h',
+-            'c/enc/hash_longest_match_inc.h',
+-            'c/enc/hash_longest_match_quickly_inc.h',
+-            'c/enc/hash_rolling_inc.h',
+-            'c/enc/hash_to_binary_tree_inc.h',
+-            'c/enc/histogram.h',
+-            'c/enc/histogram_inc.h',
+-            'c/enc/literal_cost.h',
+-            'c/enc/memory.h',
+-            'c/enc/metablock.h',
+-            'c/enc/metablock_inc.h',
+-            'c/enc/params.h',
+-            'c/enc/prefix.h',
+-            'c/enc/quality.h',
+-            'c/enc/ringbuffer.h',
+-            'c/enc/static_dict.h',
+-            'c/enc/static_dict_lut.h',
+-            'c/enc/utf8_util.h',
+-            'c/enc/write_bits.h',
+         ],
+         include_dirs=[
+             'c/include',
+         ],
++        libraries=[
++            'brotlicommon',
++            'brotlidec',
++            'brotlienc',
++        ],
+         language='c++'),
+ ]
+ 
diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..3f4cfafc3f7d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel brotli-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz"
+checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+
+post_install() {
+	vlicense LICENSE
+}

From 66e88997f65580de8ac7adbc5f014cdca7a4e309 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/12] New package: python3-multivolumefile-0.2.3

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..4aa4ee9c4577
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.3
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=a0648d0aafbc96e59198d5c17e9acad7eb531abea51035d08ce8060dcad709d6

From 37d1198566a29655c18ba6245b6f46b5cb065ac1 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/12] New package: python3-pybcj-0.5.0

---
 srcpkgs/python3-pybcj/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-pybcj/template

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
new file mode 100644
index 000000000000..24e9869999e0
--- /dev/null
+++ b/srcpkgs/python3-pybcj/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-pybcj'
+pkgname=python3-pybcj
+version=0.5.0
+revision=1
+wrksrc="pybcj-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+#checkdepends="python3-pytest python3-pytest-cov"
+short_desc="BCJ(Branch-Call-Jump) filter for python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/pybcj"
+distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
+checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f

From e1bd17ecde1db73d7e08af413555abcdd052eee6 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/12] New package: python3-pyppmd-0.17.1

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..6449ad14345f
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.1
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=ebc65d393d58b5463fdfbdf9b27e51b6aef9a9142052a50685a5dfdba91f5808
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 51f637c4baa686a812a9dbec846d1c5645365a8d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/12] New package: python3-py7zr-0.16.2

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..674347e85cc9
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.2
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=e741f0271ebb12551e4a4b57bf01fca226e7136ff301d15c083cd262f8c4a0d6
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 75b065917514daa8d321650eeb3fd6d500aab897 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/12] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 3dad476b67d4bdf4bd777d9b8b2d810e304d9251 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/12] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From d312553cd10c24e0718f04b20cf96954f6cafa67 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/12] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From d7394eb896575a2c8a416e0397a393cd4b286d86 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/12] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..62b47885bba8
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="${depends} python3-pytest"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 6f52b21ea512724d48043c63e83dd50dcdb1941c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 09:50:48 -0400
Subject: [PATCH 11/12] python3-jellyfish: update to 0.8.8.

---
 srcpkgs/python3-jellyfish/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..6a5d65937649 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,24 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.8
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)"
+	python3 -m pytest "${PYTHONPATH}/jellyfish/test.py"
+}
 
 post_install() {
 	vlicense LICENSE

From a917524eb1f394d198b491fea525d4ae2c2b025a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 12/12] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (23 preceding siblings ...)
  2021-10-21 21:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-21 21:05 ` TinfoilSubmarine
  2021-10-21 22:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
  2021-10-22 14:09 ` TinfoilSubmarine
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 21:05 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-949002142

Comment:
Re-pushed to split the brotli patch into two since I additionally had to patch some of the tests because the tarball didn't include all of the test data.

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: [PR PATCH] [Updated] beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (24 preceding siblings ...)
  2021-10-21 21:05 ` TinfoilSubmarine
@ 2021-10-21 22:44 ` TinfoilSubmarine
  2021-10-22 14:09 ` TinfoilSubmarine
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-21 22:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/TinfoilSubmarine/void-packages beets
https://github.com/void-linux/void-packages/pull/33394

beets: update to 1.5.0.
<!-- Mark items with [x] where applicable -->

#### 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?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] 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
-->

Added new dependencies. Specifically, the beets devs factored out some functionality into mediafile and confuse. reflink and py7zr are needed for new functionality added.

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

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

From 75122771fba31740696774fbb131e7ce2eca5e6d Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:56:52 -0400
Subject: [PATCH 01/12] New package: python3-pyzstd-0.15.0

---
 srcpkgs/python3-pyzstd/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/python3-pyzstd/template

diff --git a/srcpkgs/python3-pyzstd/template b/srcpkgs/python3-pyzstd/template
new file mode 100644
index 000000000000..708b8a193d9b
--- /dev/null
+++ b/srcpkgs/python3-pyzstd/template
@@ -0,0 +1,22 @@
+# Template file for 'python3-pyzstd'
+pkgname=python3-pyzstd
+version=0.15.0
+revision=1
+wrksrc="pyzstd-${version}"
+build_style=python3-module
+make_build_args="--dynamic-link-zstd"
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel libzstd-devel"
+depends="python3"
+short_desc="Python bindings to zstd, API is similar to bz2/lzma/zlib module"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="BSD-3-Clause"
+homepage="https://github.com/animalize/pyzstd"
+distfiles="${PYPI_SITE}/p/pyzstd/pyzstd-${version}.tar.gz"
+checksum=bf15a39cb3c9b662775e22ffa8c4da09fdde6a15ece5e0ed710b6d3b4329cf36
+# test is broken and can't be run by setup.py or pytest
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From c17d564644194b61b2eb61236e43457a51fb6b7e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:23 -0400
Subject: [PATCH 02/12] New package: python3-Brotli-1.0.9

---
 .../patches/missing-test-cases.patch          |  16 +++
 .../patches/use-system-brotli.patch           | 103 ++++++++++++++++++
 srcpkgs/python3-Brotli/template               |  19 ++++
 3 files changed, 138 insertions(+)
 create mode 100644 srcpkgs/python3-Brotli/patches/missing-test-cases.patch
 create mode 100644 srcpkgs/python3-Brotli/patches/use-system-brotli.patch
 create mode 100644 srcpkgs/python3-Brotli/template

diff --git a/srcpkgs/python3-Brotli/patches/missing-test-cases.patch b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch
new file mode 100644
index 000000000000..cbefb7557a2d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/missing-test-cases.patch
@@ -0,0 +1,16 @@
+diff --git a/python/tests/_test_utils.py b/python/tests/_test_utils.py
+index 104e654..6cf12b0 100644
+--- a/python/tests/_test_utils.py
++++ b/python/tests/_test_utils.py
+@@ -36,10 +36,7 @@ TESTDATA_DIR = os.path.join(test_dir, 'testdata')
+ 
+ TESTDATA_FILES = [
+     'empty',  # Empty file
+-    '10x10y',  # Small text
+-    'alice29.txt',  # Large text
+-    'random_org_10k.bin',  # Small data
+-    'mapsdatazrh',  # Large data
++    'ukkonooa',  # Small text
+ ]
+ 
+ TESTDATA_PATHS = [os.path.join(TESTDATA_DIR, f) for f in TESTDATA_FILES]
diff --git a/srcpkgs/python3-Brotli/patches/use-system-brotli.patch b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
new file mode 100644
index 000000000000..d24964295cb0
--- /dev/null
+++ b/srcpkgs/python3-Brotli/patches/use-system-brotli.patch
@@ -0,0 +1,103 @@
+diff --git a/setup.py b/setup.py
+index 25626ec..fdf27a2 100644
+--- a/setup.py
++++ b/setup.py
+@@ -181,93 +181,18 @@ EXT_MODULES = [
+         '_brotli',
+         sources=[
+             'python/_brotli.cc',
+-            'c/common/constants.c',
+-            'c/common/context.c',
+-            'c/common/dictionary.c',
+-            'c/common/platform.c',
+-            'c/common/transform.c',
+-            'c/dec/bit_reader.c',
+-            'c/dec/decode.c',
+-            'c/dec/huffman.c',
+-            'c/dec/state.c',
+-            'c/enc/backward_references.c',
+-            'c/enc/backward_references_hq.c',
+-            'c/enc/bit_cost.c',
+-            'c/enc/block_splitter.c',
+-            'c/enc/brotli_bit_stream.c',
+-            'c/enc/cluster.c',
+-            'c/enc/command.c',
+-            'c/enc/compress_fragment.c',
+-            'c/enc/compress_fragment_two_pass.c',
+-            'c/enc/dictionary_hash.c',
+-            'c/enc/encode.c',
+-            'c/enc/encoder_dict.c',
+-            'c/enc/entropy_encode.c',
+-            'c/enc/fast_log.c',
+-            'c/enc/histogram.c',
+-            'c/enc/literal_cost.c',
+-            'c/enc/memory.c',
+-            'c/enc/metablock.c',
+-            'c/enc/static_dict.c',
+-            'c/enc/utf8_util.c',
+         ],
+         depends=[
+-            'c/common/constants.h',
+-            'c/common/context.h',
+-            'c/common/dictionary.h',
+-            'c/common/platform.h',
+-            'c/common/transform.h',
+             'c/common/version.h',
+-            'c/dec/bit_reader.h',
+-            'c/dec/huffman.h',
+-            'c/dec/prefix.h',
+-            'c/dec/state.h',
+-            'c/enc/backward_references.h',
+-            'c/enc/backward_references_hq.h',
+-            'c/enc/backward_references_inc.h',
+-            'c/enc/bit_cost.h',
+-            'c/enc/bit_cost_inc.h',
+-            'c/enc/block_encoder_inc.h',
+-            'c/enc/block_splitter.h',
+-            'c/enc/block_splitter_inc.h',
+-            'c/enc/brotli_bit_stream.h',
+-            'c/enc/cluster.h',
+-            'c/enc/cluster_inc.h',
+-            'c/enc/command.h',
+-            'c/enc/compress_fragment.h',
+-            'c/enc/compress_fragment_two_pass.h',
+-            'c/enc/dictionary_hash.h',
+-            'c/enc/encoder_dict.h',
+-            'c/enc/entropy_encode.h',
+-            'c/enc/entropy_encode_static.h',
+-            'c/enc/fast_log.h',
+-            'c/enc/find_match_length.h',
+-            'c/enc/hash.h',
+-            'c/enc/hash_composite_inc.h',
+-            'c/enc/hash_forgetful_chain_inc.h',
+-            'c/enc/hash_longest_match64_inc.h',
+-            'c/enc/hash_longest_match_inc.h',
+-            'c/enc/hash_longest_match_quickly_inc.h',
+-            'c/enc/hash_rolling_inc.h',
+-            'c/enc/hash_to_binary_tree_inc.h',
+-            'c/enc/histogram.h',
+-            'c/enc/histogram_inc.h',
+-            'c/enc/literal_cost.h',
+-            'c/enc/memory.h',
+-            'c/enc/metablock.h',
+-            'c/enc/metablock_inc.h',
+-            'c/enc/params.h',
+-            'c/enc/prefix.h',
+-            'c/enc/quality.h',
+-            'c/enc/ringbuffer.h',
+-            'c/enc/static_dict.h',
+-            'c/enc/static_dict_lut.h',
+-            'c/enc/utf8_util.h',
+-            'c/enc/write_bits.h',
+         ],
+         include_dirs=[
+             'c/include',
+         ],
++        libraries=[
++            'brotlicommon',
++            'brotlidec',
++            'brotlienc',
++        ],
+         language='c++'),
+ ]
+ 
diff --git a/srcpkgs/python3-Brotli/template b/srcpkgs/python3-Brotli/template
new file mode 100644
index 000000000000..3f4cfafc3f7d
--- /dev/null
+++ b/srcpkgs/python3-Brotli/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-Brotli'
+pkgname=python3-Brotli
+version=1.0.9
+revision=1
+wrksrc="brotli-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel brotli-devel"
+depends="python3"
+short_desc="Python bindings for the Brotli compression library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/google/brotli"
+distfiles="https://github.com/google/brotli/archive/v${version}.tar.gz"
+checksum=f9e8d81d0405ba66d181529af42a3354f838c939095ff99930da6aa9cdf6fe46
+
+post_install() {
+	vlicense LICENSE
+}

From bd4049b6421fdc0e61fd5b68daae1f8439b0d34e Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:57:40 -0400
Subject: [PATCH 03/12] New package: python3-multivolumefile-0.2.3

---
 srcpkgs/python3-multivolumefile/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/python3-multivolumefile/template

diff --git a/srcpkgs/python3-multivolumefile/template b/srcpkgs/python3-multivolumefile/template
new file mode 100644
index 000000000000..4aa4ee9c4577
--- /dev/null
+++ b/srcpkgs/python3-multivolumefile/template
@@ -0,0 +1,14 @@
+# Template file for 'python3-multivolumefile'
+pkgname=python3-multivolumefile
+version=0.2.3
+revision=1
+wrksrc="multivolumefile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3"
+short_desc="Multi volume file wrapper "
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/multivolume"
+distfiles="${PYPI_SITE}/m/multivolumefile/multivolumefile-${version}.tar.gz"
+checksum=a0648d0aafbc96e59198d5c17e9acad7eb531abea51035d08ce8060dcad709d6

From 0dd44fd80ed917608f24e89556259fec88a07f23 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:00 -0400
Subject: [PATCH 04/12] New package: python3-pybcj-0.5.0

---
 srcpkgs/python3-pybcj/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/python3-pybcj/template

diff --git a/srcpkgs/python3-pybcj/template b/srcpkgs/python3-pybcj/template
new file mode 100644
index 000000000000..9e0e806f9583
--- /dev/null
+++ b/srcpkgs/python3-pybcj/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-pybcj'
+pkgname=python3-pybcj
+version=0.5.0
+revision=1
+wrksrc="pybcj-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="BCJ(Branch-Call-Jump) filter for python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/pybcj"
+distfiles="${PYPI_SITE}/p/pybcj/pybcj-${version}.tar.gz"
+checksum=8de74f338874c698e405a72181eb0ea2e011ed5a6567e0feca524275f113bb0f

From 3a3f129355ca3e8e03e7b86fc2a039edb73ff4cb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:14 -0400
Subject: [PATCH 05/12] New package: python3-pyppmd-0.17.1

---
 srcpkgs/python3-pyppmd/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyppmd/template

diff --git a/srcpkgs/python3-pyppmd/template b/srcpkgs/python3-pyppmd/template
new file mode 100644
index 000000000000..6449ad14345f
--- /dev/null
+++ b/srcpkgs/python3-pyppmd/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyppmd'
+pkgname=python3-pyppmd
+version=0.17.1
+revision=1
+wrksrc="pyppmd-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+makedepends="python3-devel"
+depends="python3"
+short_desc="Python interface for PPM variation H and I.2"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.0-or-later"
+homepage="https://github.com/miurahr/pyppmd"
+distfiles="${PYPI_SITE}/p/pyppmd/pyppmd-${version}.tar.gz"
+checksum=ebc65d393d58b5463fdfbdf9b27e51b6aef9a9142052a50685a5dfdba91f5808
+# testing requires unpackaged plugin pytest-benchmark
+make_check=no

From 81fdf8d181c25a362bb79ca9891f547db0ed5a2a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:30 -0400
Subject: [PATCH 06/12] New package: python3-py7zr-0.16.2

---
 srcpkgs/python3-py7zr/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-py7zr/template

diff --git a/srcpkgs/python3-py7zr/template b/srcpkgs/python3-py7zr/template
new file mode 100644
index 000000000000..674347e85cc9
--- /dev/null
+++ b/srcpkgs/python3-py7zr/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-py7zr'
+pkgname=python3-py7zr
+version=0.16.2
+revision=1
+wrksrc="py7zr-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools_scm"
+depends="python3-texttable python3-pycryptodomex python3-importlib_metadata
+ python3-Brotli python3-pyzstd python3-pyppmd python3-pybcj
+ python3-multivolumefile"
+short_desc="7zip in python3 with various compressions, and AES encryption"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="LGPL-2.1-or-later"
+homepage="https://github.com/miurahr/py7zr"
+distfiles="${PYPI_SITE}/p/py7zr/py7zr-${version}.tar.gz"
+checksum=e741f0271ebb12551e4a4b57bf01fca226e7136ff301d15c083cd262f8c4a0d6
+# testing requires unpackaged modules:
+# pyannotate_runtime, pytest-benchmark, pytest-remotedata, pytest-profiling
+make_check=no

From 5c60c0fbf32b772d2d9ab1eeae3114fbc4aa8a1c Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:58:46 -0400
Subject: [PATCH 07/12] New package: python3-responses-0.14.0

---
 srcpkgs/python3-responses/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/python3-responses/template

diff --git a/srcpkgs/python3-responses/template b/srcpkgs/python3-responses/template
new file mode 100644
index 000000000000..feb108d12155
--- /dev/null
+++ b/srcpkgs/python3-responses/template
@@ -0,0 +1,16 @@
+# Template file for 'python3-responses'
+pkgname=python3-responses
+version=0.14.0
+revision=1
+wrksrc="responses-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-requests python3-urllib3 python3-six"
+short_desc="Utility for mocking out the Python Requests library"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="Apache-2.0"
+homepage="https://github.com/getsentry/responses"
+distfiles="${PYPI_SITE}/r/responses/responses-${version}.tar.gz"
+checksum=93f774a762ee0e27c0d9d7e06227aeda9ff9f5f69392f72bb6c6b73f8763563e
+# testing requires unpackaged plugin pytest-localserver
+make_check=no

From 406d48210d5c6a1912ccc9bf33aeb1fe5ef3a618 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:04 -0400
Subject: [PATCH 08/12] New package: python3-confuse-1.6.0

---
 srcpkgs/python3-confuse/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-confuse/template

diff --git a/srcpkgs/python3-confuse/template b/srcpkgs/python3-confuse/template
new file mode 100644
index 000000000000..b12a34c13792
--- /dev/null
+++ b/srcpkgs/python3-confuse/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-confuse'
+pkgname=python3-confuse
+version=1.6.0
+revision=1
+wrksrc="confuse-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-yaml"
+checkdepends="${depends} python3-pytest"
+short_desc="Painless YAML config files for Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/confuse"
+distfiles="${PYPI_SITE}/c/confuse/confuse-${version}.tar.gz"
+checksum=d60104c0b2a708041ac27487fa6ee69bd37d910549659c7ba92f52cbe2ced4dc
+
+post_install() {
+	vlicense LICENSE
+}

From bd74aeb217be891824738d619e11473651055e95 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:17 -0400
Subject: [PATCH 09/12] New package: python3-reflink-0.2.1

---
 .../remove-deprecated-pytest-runner.patch     | 21 +++++++++++++++++
 srcpkgs/python3-reflink/template              | 23 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
 create mode 100644 srcpkgs/python3-reflink/template

diff --git a/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
new file mode 100644
index 000000000000..f43dc7653561
--- /dev/null
+++ b/srcpkgs/python3-reflink/patches/remove-deprecated-pytest-runner.patch
@@ -0,0 +1,21 @@
+--- a/setup.py	2021-10-06 20:25:26.847727634 -0400
++++ b/setup.py	2021-10-06 20:25:54.167862198 -0400
+@@ -18,11 +18,6 @@
+     'cffi',
+ ]
+ 
+-setup_requirements = [
+-    'cffi',
+-    'pytest-runner',
+-]
+-
+ test_requirements = [
+     'pytest',
+ ]
+@@ -60,6 +55,5 @@
+         ],
+         test_suite='tests',
+         tests_require=test_requirements,
+-        setup_requires=setup_requirements,
+         cffi_modules=["reflink/native.py:ffibuilder"]
+     )
diff --git a/srcpkgs/python3-reflink/template b/srcpkgs/python3-reflink/template
new file mode 100644
index 000000000000..01a654c8b8f4
--- /dev/null
+++ b/srcpkgs/python3-reflink/template
@@ -0,0 +1,23 @@
+# Template file for 'python3-reflink'
+pkgname=python3-reflink
+version=0.2.1
+revision=1
+wrksrc="reflink-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+makedepends="python3-devel python3-cffi"
+depends="python3-cffi"
+short_desc="Python wrapper around the reflink system calls"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://gitlab.com/rubdos/pyreflink"
+distfiles="${PYPI_SITE}/r/reflink/reflink-${version}.tar.gz"
+checksum=c9253582db24413bfd703abfc1b2a49de78f31b4907239f286e9a1929a1e6e3a
+# test suite includes calls to mount/umount and writing to /dev which fail due
+# to chroot-util-linux not including mount/umount and no permissions,
+# respectively
+make_check=no
+
+post_install() {
+	vlicense LICENSE
+}

From a3f13ed66db7f61f665dd56ee721a7700f836179 Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:25 -0400
Subject: [PATCH 10/12] New package: python3-mediafile-0.8.1

---
 srcpkgs/python3-mediafile/template | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 srcpkgs/python3-mediafile/template

diff --git a/srcpkgs/python3-mediafile/template b/srcpkgs/python3-mediafile/template
new file mode 100644
index 000000000000..62b47885bba8
--- /dev/null
+++ b/srcpkgs/python3-mediafile/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-mediafile'
+pkgname=python3-mediafile
+version=0.8.1
+revision=1
+wrksrc="mediafile-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-mutagen python3-six"
+checkdepends="${depends} python3-pytest"
+short_desc="Read and write audio files' tags in Python"
+maintainer="Joel Beckmeyer <joel@beckmeyer.us>"
+license="MIT"
+homepage="https://github.com/beetbox/mediafile"
+distfiles="${PYPI_SITE}/m/mediafile/mediafile-${version}.tar.gz"
+checksum=878ccc378b77f2d6c175abea135ea25631f28c722e01e1a051924d962ebea165
+
+post_install() {
+	vlicense LICENSE
+}

From 47517d1823669c05243a88860eaac371f1296eeb Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Tue, 12 Oct 2021 09:50:48 -0400
Subject: [PATCH 11/12] python3-jellyfish: update to 0.8.8.

---
 srcpkgs/python3-jellyfish/template | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/python3-jellyfish/template b/srcpkgs/python3-jellyfish/template
index c1b55e36e8ef..6a5d65937649 100644
--- a/srcpkgs/python3-jellyfish/template
+++ b/srcpkgs/python3-jellyfish/template
@@ -1,18 +1,24 @@
 # Template file for 'python3-jellyfish'
 pkgname=python3-jellyfish
-version=0.7.2
-revision=4
+version=0.8.8
+revision=1
 wrksrc="jellyfish-${version}"
 build_style=python3-module
-pycompile_module="jellyfish"
 hostmakedepends=" python3-setuptools"
 makedepends="python3-devel"
+depends="python3"
+checkdepends="python3-pytest"
 short_desc="Python3 library for approximate and phonetic matching of strings"
 maintainer="Duncaen <duncaen@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://github.com/sunlightlabs/jellyfish"
 distfiles="${PYPI_SITE}/j/jellyfish/jellyfish-${version}.tar.gz"
-checksum=cb09c50d7e2bb7b926fc7654762bc81f9c629e0c92ae7137bf22b34f39515286
+checksum=0506089cacf9b5897442134417b04b3c6610c19f280ae535eace390dc6325a5c
+
+do_check() {
+	PYTHONPATH="$(cd build/lib* && pwd)"
+	python3 -m pytest "${PYTHONPATH}/jellyfish/test.py"
+}
 
 post_install() {
 	vlicense LICENSE

From 05961727d80f083269492ba1fb3335d34c13048a Mon Sep 17 00:00:00 2001
From: Joel Beckmeyer <joel@beckmeyer.us>
Date: Wed, 6 Oct 2021 18:59:34 -0400
Subject: [PATCH 12/12] beets: update to 1.5.0.

---
 srcpkgs/beets/patches/python-3.8.patch | 53 --------------------------
 srcpkgs/beets/template                 | 20 +++++-----
 2 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 srcpkgs/beets/patches/python-3.8.patch

diff --git a/srcpkgs/beets/patches/python-3.8.patch b/srcpkgs/beets/patches/python-3.8.patch
deleted file mode 100644
index fc394e59ba00..000000000000
--- a/srcpkgs/beets/patches/python-3.8.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From dab0c1f9abda5b17cc7488f89a6fe08be7bc56a0 Mon Sep 17 00:00:00 2001
-From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com>
-Date: Tue, 9 Jun 2020 19:34:31 +0200
-Subject: [PATCH] compatibility with breaking changes to the ast module
-
-new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649
-In fact, our generation of some Literals has been invalid since Python
-3.4, fix that too.
----
- https://github.com/beetbox/beets/pull/3621
- beets/util/functemplate.py | 29 ++++++++++++++++++++---------
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git beets/util/functemplate.py beets/util/functemplate.py
-index af22b79082..266534a9b4 100644
---- a/beets/util/functemplate.py
-+++ b/beets/util/functemplate.py
-@@ -73,15 +73,26 @@ def ex_literal(val):
-     """An int, float, long, bool, string, or None literal with the given
-     value.
-     """
--    if val is None:
--        return ast.Name('None', ast.Load())
--    elif isinstance(val, six.integer_types):
--        return ast.Num(val)
--    elif isinstance(val, bool):
--        return ast.Name(bytes(val), ast.Load())
--    elif isinstance(val, six.string_types):
--        return ast.Str(val)
--    raise TypeError(u'no literal for {0}'.format(type(val)))
-+    if sys.version_info[:2] < (3, 4):
-+        if val is None:
-+            return ast.Name('None', ast.Load())
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, bool):
-+            return ast.Name(bytes(val), ast.Load())
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    elif sys.version_info[:2] < (3, 6):
-+        if val in [None, True, False]:
-+            return ast.NameConstant(val)
-+        elif isinstance(val, six.integer_types):
-+            return ast.Num(val)
-+        elif isinstance(val, six.string_types):
-+            return ast.Str(val)
-+        raise TypeError(u'no literal for {0}'.format(type(val)))
-+    else:
-+        return ast.Constant(val)
- 
- 
- def ex_varassign(name, expr):
diff --git a/srcpkgs/beets/template b/srcpkgs/beets/template
index adb2acc85cc8..e5a05f6c687e 100644
--- a/srcpkgs/beets/template
+++ b/srcpkgs/beets/template
@@ -1,22 +1,22 @@
 # Template file for 'beets'
 pkgname=beets
-version=1.4.9
-revision=5
+version=1.5.0
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-setuptools python3-munkres python3-musicbrainzngs
- python3-Unidecode python3-yaml python3-jellyfish python3-six python3-mutagen"
-# test_web is failing
-checkdepends="$depends python3-discogs_client python3-mpd2 python3-xdg
- python3-rarfile python3-pylast python3-gobject python3-mock python3-Flask
- python3-BeautifulSoup4 python3-itsdangerous python3-click python3-Werkzeug
- python3-Jinja2 python3-soupsieve python3-MarkupSafe"
+depends="python3-munkres python3-musicbrainzngs python3-Unidecode python3-yaml
+ python3-jellyfish python3-mediafile python3-confuse"
+checkdepends="$depends python3-BeautifulSoup4 python3-coverage python3-Flask
+ python3-mock python3-pylast python3-pytest python3-mpd2 python3-xdg
+ python3-responses python3-requests-oauthlib python3-reflink python3-rarfile
+ python3-discogs_client python3-py7zr"
 short_desc="Media library management system for obsessive-compulsive music geeks"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://beets.radbox.org/"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=d29b432cab0c80947b5229f548762948c4dd4a430e5d02760bfeb95da3cc8054
+checksum=887f7bbac0fc14c49469e50d406fd216f914a27acf3818c6503c223f9825342b
+make_check=ci-skip # tests don't work as root
 
 post_install() {
 	vman man/beet.1

^ permalink raw reply	[flat|nested] 28+ messages in thread

* Re: beets: update to 1.5.0.
  2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
                   ` (25 preceding siblings ...)
  2021-10-21 22:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
@ 2021-10-22 14:09 ` TinfoilSubmarine
  26 siblings, 0 replies; 28+ messages in thread
From: TinfoilSubmarine @ 2021-10-22 14:09 UTC (permalink / raw)
  To: ml

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

New comment by TinfoilSubmarine on void-packages repository

https://github.com/void-linux/void-packages/pull/33394#issuecomment-949666843

Comment:
@ericonr I think this is ready for review again with the Brotli patch incorporated now.

^ permalink raw reply	[flat|nested] 28+ messages in thread

end of thread, other threads:[~2021-10-22 14:09 UTC | newest]

Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-06 23:09 [PR PATCH] beets: update to 1.5.0 TinfoilSubmarine
2021-10-07  0:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-07  0:29 ` TinfoilSubmarine
2021-10-07  0:44 ` TinfoilSubmarine
2021-10-07  0:45 ` TinfoilSubmarine
2021-10-07  0:45 ` TinfoilSubmarine
2021-10-07  1:44 ` ericonr
2021-10-07  2:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-07 12:34 ` TinfoilSubmarine
2021-10-07 12:34 ` TinfoilSubmarine
2021-10-08 14:40 ` ericonr
2021-10-12 14:00 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-12 14:01 ` TinfoilSubmarine
2021-10-12 19:50 ` [PR REVIEW] " ericonr
2021-10-12 19:50 ` ericonr
2021-10-12 19:50 ` ericonr
2021-10-12 20:13 ` TinfoilSubmarine
2021-10-12 20:16 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-13  0:53 ` [PR REVIEW] " ericonr
2021-10-13 13:23 ` TinfoilSubmarine
2021-10-21 18:46 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-21 18:47 ` TinfoilSubmarine
2021-10-21 20:48 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-21 20:55 ` [PR REVIEW] " TinfoilSubmarine
2021-10-21 21:04 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-21 21:05 ` TinfoilSubmarine
2021-10-21 22:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-22 14:09 ` TinfoilSubmarine

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ https://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git