From ef3aedd739e4054aa402df8d9bccd2c325d979ec Mon Sep 17 00:00:00 2001 From: Joel Beckmeyer 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " +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 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 " 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