From: TinfoilSubmarine <TinfoilSubmarine@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] beets: update to 1.5.0.
Date: Thu, 21 Oct 2021 23:04:21 +0200 [thread overview]
Message-ID: <20211021210421.mP4b_tTcvvkK27CRUP0KVnHXdKHV3bS-44pyWPkaMzw@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33394@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-10-21 21:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 23:09 [PR PATCH] " 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 ` TinfoilSubmarine [this message]
2021-10-21 21:05 ` TinfoilSubmarine
2021-10-21 22:44 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-10-22 14:09 ` TinfoilSubmarine
2021-10-30 19:02 ` ericonr
2021-10-30 21:20 ` [PR PATCH] [Updated] " TinfoilSubmarine
2021-11-04 1:13 ` [PR PATCH] [Merged]: " ericonr
2021-11-07 12:18 ` paper42
2021-11-07 13:05 ` TinfoilSubmarine
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211021210421.mP4b_tTcvvkK27CRUP0KVnHXdKHV3bS-44pyWPkaMzw@z \
--to=tinfoilsubmarine@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).