From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] python3-setuptools: update to 52.0.0.
Date: Thu, 28 Jan 2021 21:03:41 +0100 [thread overview]
Message-ID: <20210128200341.ZnRRb31bPoL85FsM5AEaKhcmNKPWkEL4VcIk52L1zc4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28261@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 808 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages setuptools
https://github.com/void-linux/void-packages/pull/28261
python3-setuptools: update to 52.0.0.
This release drops `easy_install`, which will cause hard failures when building python-module or python3-module templates that do not specify all of their setup_requires dependencies in `hostmakedepends`. This is a good thing; before, setuptools would fetch setup dependencies on its own, negatively impacting the reproducibility of package builds.
Still, I am going to run through rebuilds of some (most? all?) of the `python3-*` packages to check for build-time breakage.
A patch file from https://github.com/void-linux/void-packages/pull/28261.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-setuptools-28261.patch --]
[-- Type: text/x-diff, Size: 44626 bytes --]
From 2c9dc69d978dc47748a6dbdffa3e9f4f469dc183 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 27 Jan 2021 10:13:39 -0500
Subject: [PATCH 01/40] python3-setuptools: update to 52.0.0.
This release drops easy_install, which will cause hard failures when
building python-module or python3-module templates that do not specify
all of their setup_requires dependencies in `hostmakedepends`. This is a
good thing; before, setuptools would fetch setup dependencies on its
own, negatively impacting the reproducibility of package builds.
---
srcpkgs/python3-setuptools/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-setuptools/template b/srcpkgs/python3-setuptools/template
index 60a379ef73f..a694659b68d 100644
--- a/srcpkgs/python3-setuptools/template
+++ b/srcpkgs/python3-setuptools/template
@@ -1,6 +1,6 @@
# Template file for 'python3-setuptools'
pkgname=python3-setuptools
-version=51.3.3
+version=52.0.0
revision=1
wrksrc="setuptools-${version}"
build_style=python3-module
@@ -14,8 +14,7 @@ license="MIT"
homepage="https://github.com/pypa/setuptools"
changelog="https://raw.githubusercontent.com/pypa/setuptools/master/CHANGES.rst"
distfiles="${PYPI_SITE}/s/setuptools/setuptools-${version}.tar.gz"
-checksum=127ec775c4772bfaf2050557b00c4be6e019e52dc2e171a3fb1cd474783a2497
-alternatives="setuptools:easy_install:/usr/bin/easy_install3"
+checksum=fb3a1ee622509550dbf1d419f241296169d7f09cb1eb5b1736f2f10965932b96
provides="python3-distribute-${version}_1"
replaces="python3-distribute>=0"
@@ -31,5 +30,4 @@ do_check() {
post_install() {
vlicense LICENSE
- mv ${PKGDESTDIR}/usr/bin/easy_install ${PKGDESTDIR}/usr/bin/easy_install3
}
From 0b873bba5d162a75acbf676c69fb97ee638fe644 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:02:46 -0500
Subject: [PATCH 02/40] python3-Flask-User: specify all python3 hostmakedepends
---
srcpkgs/python3-Flask-User/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-Flask-User/template b/srcpkgs/python3-Flask-User/template
index ad2fa8483c7..cdd74414e78 100644
--- a/srcpkgs/python3-Flask-User/template
+++ b/srcpkgs/python3-Flask-User/template
@@ -1,11 +1,12 @@
# Template file for 'python3-Flask-User'
pkgname=python3-Flask-User
version=1.0.2.2
-revision=2
+revision=3
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-Flask python3-Flask-Login python3-Flask-WTF python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
+hostmakedepends="python3-setuptools python3-Flask-Login"
+depends="python3-Flask python3-Flask-Login python3-Flask-WTF
+ python3-Flask-SQLAlchemy python3-Flask-Mail python3-Flask-Babel"
short_desc="User session management for Flask (Python3)"
maintainer="pulux <pulux@pf4sh.de>"
license="MIT"
From 200976bd1fd225a1abe2cd893d7fa417db498236 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:02:53 -0500
Subject: [PATCH 03/40] python3-PGPy: specify all python3 hostmakedepends
---
srcpkgs/python3-PGPy/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-PGPy/template b/srcpkgs/python3-PGPy/template
index cb7069cb13e..6450ed62873 100644
--- a/srcpkgs/python3-PGPy/template
+++ b/srcpkgs/python3-PGPy/template
@@ -1,11 +1,11 @@
# Template file for 'python3-PGPy'
pkgname=python3-PGPy
version=0.5.3
-revision=1
+revision=2
wrksrc=PGPy-${version}
build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-devel"
+hostmakedepends="python3-setuptools python3-wheel"
+depends="python3-cryptography python3-pyasn1 python3-six"
short_desc="Pretty Good Privacy for Python"
maintainer="Anjandev Momi <anjan@momi.ca>"
license="BSD-3-Clause"
From 3ed277ca0e3a5ab2c2e3563ac5fe7368e82dfa70 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:08:52 -0500
Subject: [PATCH 04/40] python3-aiohttp-sse-client: specify all python3
hostmakedepends
---
srcpkgs/python3-aiohttp-sse-client/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-aiohttp-sse-client/template b/srcpkgs/python3-aiohttp-sse-client/template
index ce2167e0563..45ff6693e2a 100644
--- a/srcpkgs/python3-aiohttp-sse-client/template
+++ b/srcpkgs/python3-aiohttp-sse-client/template
@@ -1,7 +1,7 @@
# Template file for 'python3-aiohttp-sse-client'
pkgname=python3-aiohttp-sse-client
version=0.2.0
-revision=1
+revision=2
wrksrc="${pkgname#*-}-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,3 +13,8 @@ license="Apache-2.0"
homepage="https://github.com/rtfol/aiohttp-sse-client"
distfiles="${homepage}/archive/v${version}.tar.gz"
checksum=7fe8f9af35cf9a97249562e81a35c2f86544ce388928223205021ab00c30edca
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requirements/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
From 47eb570fd0b49838cc20f80628c8e0c15e224d83 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:34:07 -0500
Subject: [PATCH 05/40] python3-audioread: specify all python3 hostmakedepends
---
srcpkgs/python3-audioread/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-audioread/template b/srcpkgs/python3-audioread/template
index 8db13a91ddb..0fad35d5c50 100644
--- a/srcpkgs/python3-audioread/template
+++ b/srcpkgs/python3-audioread/template
@@ -1,7 +1,7 @@
# Template file for 'python3-audioread'
pkgname=python3-audioread
version=2.1.8
-revision=4
+revision=5
wrksrc="audioread-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,6 +13,11 @@ homepage="https://github.com/sampsyo/audioread/"
distfiles="${PYPI_SITE}/a/audioread/audioread-${version}.tar.gz"
checksum=073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168
+post_patch() {
+ # Build doesn't actually require pytest-runner and Void doesn't offer it
+ vsed -e '/pytest-runner/d' -i setup.py
+}
+
post_install() {
sed -n '2,13p' decode.py > LICENSE
vlicense LICENSE
From e8ba78d1d9d4c5d1bd3c9babb550d3ce5037c220 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:47:47 -0500
Subject: [PATCH 06/40] python-dateutil: specify all python3 hostmakedepends
---
srcpkgs/python-dateutil/template | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template
index bfeef65df2b..a2dd2430d4d 100644
--- a/srcpkgs/python-dateutil/template
+++ b/srcpkgs/python-dateutil/template
@@ -1,10 +1,9 @@
# Template file for 'python-dateutil'
pkgname=python-dateutil
version=2.8.1
-revision=1
+revision=2
build_style=python-module
-pycompile_module="dateutil"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools python3-setuptools_scm"
depends="python-six tzdata"
short_desc="Extensions to the standard Python2 datetime module"
maintainer="Alessio Sergi <al3hex@gmail.com>"
@@ -23,7 +22,6 @@ post_install() {
python3-dateutil_package() {
depends="python3-six tzdata"
- pycompile_module="dateutil"
short_desc="${short_desc/Python2/Python3}"
pkg_install() {
vmove usr/lib/python3*
From fcbccac91026c3ed74f0fb2f8bf27741baaedb9b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 09:52:21 -0500
Subject: [PATCH 07/40] python3-ffmpeg-python: specify all python3
hostmakedepends
---
srcpkgs/python3-ffmpeg-python/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-ffmpeg-python/template b/srcpkgs/python3-ffmpeg-python/template
index a23624b27b9..171400f6f4d 100644
--- a/srcpkgs/python3-ffmpeg-python/template
+++ b/srcpkgs/python3-ffmpeg-python/template
@@ -1,7 +1,7 @@
# Template file for 'python3-ffmpeg-python'
pkgname=python3-ffmpeg-python
version=0.2.0
-revision=2
+revision=3
wrksrc="ffmpeg-python-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,3 +13,8 @@ license="Apache-2.0"
homepage="https://github.com/kkroening/ffmpeg-python"
distfiles="https://github.com/kkroening/ffmpeg-python/archive/${version}.tar.gz"
checksum="01b6b7640f00585a404194a358358bdf7f4050cedcd99f41416ac8b27222c9f1"
+
+post_patch() {
+ # Build doesn't *need* pytest-runner and Void doesn't provide it
+ vsed -e '/pytest-runner/d' -i setup.py
+}
From ddf137eb7e0d91376642539a56c6ca2068514f76 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:37:38 -0500
Subject: [PATCH 08/40] python3-gitchangelog: specify all python3
hostmakedepends
---
.../patches/setup.cfg.patch | 25 +++++++++++++++++++
.../patches/setup.py.patch | 25 +++++++++++++++++++
srcpkgs/python3-gitchangelog/template | 5 ++--
3 files changed, 52 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
create mode 100644 srcpkgs/python3-gitchangelog/patches/setup.py.patch
diff --git a/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
new file mode 100644
index 00000000000..efc271d01e0
--- /dev/null
+++ b/srcpkgs/python3-gitchangelog/patches/setup.cfg.patch
@@ -0,0 +1,25 @@
+Make sure that setuptools_scm actually installs the module and entrypoint.
+
+--- setup.cfg 2021-01-28 10:10:54.291152917 -0500
++++ setup.cfg 2021-01-28 10:13:12.191007896 -0500
+@@ -61,3 +61,20 @@
+ tag_date = 0
+ tag_svn_revision = 0
+
++[options]
++packages =
++ gitchangelog
++package_dir =
++ =src
++setup_requires =
++ setuptools
++ setuptools-scm
++
++[options.entry_points]
++console_scripts =
++ gitchangelog = gitchangelog.gitchangelog:main
++
++[options.package_data]
++gitchangelog =
++ gitchangelog.rc.*
++ templates/**/*
diff --git a/srcpkgs/python3-gitchangelog/patches/setup.py.patch b/srcpkgs/python3-gitchangelog/patches/setup.py.patch
new file mode 100644
index 00000000000..c9f5b7ced26
--- /dev/null
+++ b/srcpkgs/python3-gitchangelog/patches/setup.py.patch
@@ -0,0 +1,25 @@
+The d2to1 package is defunct and not offered by Void; roughly equivalent
+functionality is provided by setuptools_scm, which is provided by Void. Drop
+the special d2to1 setup call to allow setuptools_scm to work properly.
+
+--- setup.py 2021-01-28 10:00:20.165871918 -0500
++++ setup.py 2021-01-28 10:01:07.760817952 -0500
+@@ -58,17 +58,4 @@
+ ## Normal d2to1 setup
+ ##
+
+-setup(
+- setup_requires=['d2to1'],
+- extras_require={
+- 'Mustache': ["pystache", ],
+- 'Mako': ["mako", ],
+- 'test': [
+- "nose",
+- "minimock",
+- "mako",
+- "pystache",
+- ],
+- },
+- d2to1=True
+-)
++setup(use_scm_version=True)
diff --git a/srcpkgs/python3-gitchangelog/template b/srcpkgs/python3-gitchangelog/template
index c62eecee9a4..348dc2c83b6 100644
--- a/srcpkgs/python3-gitchangelog/template
+++ b/srcpkgs/python3-gitchangelog/template
@@ -1,11 +1,10 @@
# Template file for 'python3-gitchangelog'
pkgname=python3-gitchangelog
version=3.0.4
-revision=3
+revision=4
wrksrc="gitchangelog-${version}"
build_style=python3-module
-pycompile_module="gitchangelog"
-hostmakedepends="python3-setuptools git"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pystache python3-Mako"
short_desc="Creates a changelog from git log history"
maintainer="Orphaned <orphan@voidlinux.org>"
From 7d40096b9b76036f0974ae2a2840547abfd65e7b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:23:11 -0500
Subject: [PATCH 09/40] python3-changelogs: update to 0.15.0.
---
srcpkgs/python3-changelogs/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-changelogs/template b/srcpkgs/python3-changelogs/template
index b86a11862af..6893d6f8d97 100644
--- a/srcpkgs/python3-changelogs/template
+++ b/srcpkgs/python3-changelogs/template
@@ -1,20 +1,19 @@
# Template file for 'python3-changelogs'
pkgname=python3-changelogs
-version=0.14.0
-revision=3
+version=0.15.0
+revision=1
wrksrc="changelogs-${version}"
build_style=python3-module
-pycompile_module="changelogs"
hostmakedepends="python3-setuptools"
-depends="python3-requests python3-lxml python3-packaging python3-validators
- python3-gitchangelog"
+depends="python3-requests python3-lxml python3-packaging
+ python3-validators python3-gitchangelog"
short_desc="Changelog finder and parser for vendors like PyPi and npm"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pyupio/changelogs"
changelog="https://raw.githubusercontent.com/pyupio/changelogs/master/HISTORY.rst"
distfiles="https://github.com/pyupio/changelogs/archive/${version}.tar.gz"
-checksum=90f5e631e580f928b732e3941a5ce26520ba53879bd95daab57018e01dbfabc7
+checksum=d2c14fd7c0847effe2f8eaebf33d77c7872c60f246aa592ca6906a1b32c02b9c
post_install() {
vlicense LICENSE
From a4d4d5df13c829972ee2a6f22a63869efcb11c79 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:41:55 -0500
Subject: [PATCH 10/40] python3-guessit: specify all python3 hostmakedepends
---
srcpkgs/python3-guessit/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-guessit/template b/srcpkgs/python3-guessit/template
index ededabb16e4..8945e95b041 100644
--- a/srcpkgs/python3-guessit/template
+++ b/srcpkgs/python3-guessit/template
@@ -1,7 +1,7 @@
# Template file for 'python3-guessit'
pkgname=python3-guessit
version=3.1.1
-revision=2
+revision=3
wrksrc="guessit-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,3 +12,8 @@ license="LGPL-3.0-only"
homepage="https://guessit.readthedocs.io/en/latest/"
distfiles="${PYPI_SITE}/g/guessit/guessit-${version}.tar.gz"
checksum=71c68c6d4e9d639eba6534a838468115ad20f4c5a688eae3079f0c08d605a3b0
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
From 4cabfeb83fe0feb79b93e7f28aed1ce4bc07c421 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:43:25 -0500
Subject: [PATCH 11/40] python3-humanize: specify all python3 hostmakedepends
---
srcpkgs/python3-humanize/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-humanize/template b/srcpkgs/python3-humanize/template
index 16c3f2b99e5..c87482c4cdd 100644
--- a/srcpkgs/python3-humanize/template
+++ b/srcpkgs/python3-humanize/template
@@ -1,10 +1,10 @@
# Template file for 'python3-humanize'
pkgname=python3-humanize
version=2.0.0
-revision=2
+revision=3
wrksrc="humanize-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
checkdepends="python3-pytest python3-freezegun"
short_desc="Python humanize utilities"
maintainer="Aluísio Augusto Silva Gonçalves <aluisio@aasg.name>"
From ae10276d18324c8e1589294995dfe6ba51140466 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:48:44 -0500
Subject: [PATCH 12/40] python3-irc: specify all python3 hostmakedepends
---
srcpkgs/python3-irc/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-irc/template b/srcpkgs/python3-irc/template
index f35356ccbe7..2acc061017f 100644
--- a/srcpkgs/python3-irc/template
+++ b/srcpkgs/python3-irc/template
@@ -1,11 +1,10 @@
# Template file for 'python3-irc'
pkgname=python3-irc
version=17.1
-revision=3
+revision=4
wrksrc="irc-${version}"
build_style=python3-module
-pycompile_module="irc"
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-six"
short_desc="Full-featured Python IRC library for Python3"
maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
From aaecfde3b409ab27b1f11e2df316fd0a726205fa Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 13/40] python3-jaraco.classes: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.classes/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.classes/template b/srcpkgs/python3-jaraco.classes/template
index a7dd48bd5cd..162a4a99413 100644
--- a/srcpkgs/python3-jaraco.classes/template
+++ b/srcpkgs/python3-jaraco.classes/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.classes'
pkgname=python3-jaraco.classes
version=3.1.0
-revision=2
+revision=3
wrksrc="jaraco.classes-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-jaraco python3-more-itertools"
short_desc="Utility functions for Python class constructs (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
From 05186009c6bc831b84fe2431ed8664770ff4b49b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 14/40] python3-jaraco.collections: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.collections/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.collections/template b/srcpkgs/python3-jaraco.collections/template
index 68ee5f3c353..41e658e921e 100644
--- a/srcpkgs/python3-jaraco.collections/template
+++ b/srcpkgs/python3-jaraco.collections/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.collections'
pkgname=python3-jaraco.collections
version=3.0.0
-revision=2
+revision=3
wrksrc="jaraco.collections-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-jaraco.classes python3-jaraco.text python3-six"
short_desc="Collection of objects similar to stdlib by jaraco (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
From d13ffc8a620f92861e19bf82acb24ed10cf75533 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 15/40] python3-jaraco.text: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.text/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.text/template b/srcpkgs/python3-jaraco.text/template
index ffe2f5bb1ab..c8e03b56e64 100644
--- a/srcpkgs/python3-jaraco.text/template
+++ b/srcpkgs/python3-jaraco.text/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.text'
pkgname=python3-jaraco.text
version=3.2.0
-revision=2
+revision=3
wrksrc="jaraco.text-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-jaraco.functools python3-six"
short_desc="Module for text manipulation (Python3)"
maintainer="bra1nwave <bra1nwave@protonmail.com>"
From f708ce764f25244e8e0f92bf44caf04e9d1a2067 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:52:17 -0500
Subject: [PATCH 16/40] python3-jaraco.functools: specify all python3
hostmakedepends
---
srcpkgs/python3-jaraco.functools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-jaraco.functools/template b/srcpkgs/python3-jaraco.functools/template
index bedec81e130..d6ad6cfafa8 100644
--- a/srcpkgs/python3-jaraco.functools/template
+++ b/srcpkgs/python3-jaraco.functools/template
@@ -1,10 +1,10 @@
# Template file for 'python3-jaraco.functools'
pkgname=python3-jaraco.functools
version=3.0.1
-revision=2
+revision=3
wrksrc="jaraco.functools-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml python3-more-itertools"
depends="python3-more-itertools python3-jaraco"
checkdepends="${depends} python3-pytest python3-jaraco.classes"
short_desc="Functools like those found in stdlib (Python3)"
From a77482b3405c08f28cb7def6f2f83125b9764824 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 17/40] python3-keyring: specify all python3 hostmakedepends
---
srcpkgs/python3-keyring/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-keyring/template b/srcpkgs/python3-keyring/template
index 34b73a55048..89783fc3036 100644
--- a/srcpkgs/python3-keyring/template
+++ b/srcpkgs/python3-keyring/template
@@ -1,10 +1,10 @@
# Template file for 'python3-keyring'
pkgname=python3-keyring
version=21.2.1
-revision=2
+revision=3
wrksrc="keyring-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml"
depends="python3-setuptools python3-SecretStorage python3-entrypoints"
short_desc="Python interface to the system keyring service"
maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
From d58403ea9505c3392d1e6d28df54f4132271b47a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 18/40] python3-keyrings-alt: specify all python3
hostmakedepends
---
srcpkgs/python3-keyrings-alt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-keyrings-alt/template b/srcpkgs/python3-keyrings-alt/template
index 8ef8354489f..24e1d8a79d9 100644
--- a/srcpkgs/python3-keyrings-alt/template
+++ b/srcpkgs/python3-keyrings-alt/template
@@ -1,10 +1,10 @@
# Template file for 'python3-keyrings-alt'
pkgname=python3-keyrings-alt
version=4.0.2
-revision=1
+revision=2
wrksrc="keyrings.alt-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm python3-toml"
depends="python3-keyring"
checkdepends="${depends} python3-pytest"
short_desc="Alternate keyring backend implementations"
From f2515183e9e68f3630e0d0a1db0923b1c0d0062b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 10:56:50 -0500
Subject: [PATCH 19/40] python3-keyutils: specify all python3 hostmakedepends
---
srcpkgs/python3-keyutils/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-keyutils/template b/srcpkgs/python3-keyutils/template
index dae38bbae85..6a71cbb6b4e 100644
--- a/srcpkgs/python3-keyutils/template
+++ b/srcpkgs/python3-keyutils/template
@@ -1,7 +1,7 @@
# Template file for 'python3-keyutils'
pkgname=python3-keyutils
version=0.6
-revision=4
+revision=5
wrksrc=python-keyutils-$version
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,3 +12,8 @@ license="Apache-2.0"
homepage="https://github.com/sassoftware/python-keyutils"
distfiles="https://github.com/sassoftware/python-keyutils/archive/${version}.tar.gz"
checksum=f69e6cadc50525dcb117714e440ee6579b0e5b7f12910b2bb2e910b236a2b18b
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
From 561e790a279e2e8d2ec3d5f005a9ffbdfbd7ae64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:02:10 -0500
Subject: [PATCH 20/40] python3-marisa-trie: specify all python3
hostmakedepends
---
srcpkgs/python3-marisa-trie/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-marisa-trie/template b/srcpkgs/python3-marisa-trie/template
index 288e5650df1..9b4d15dbffa 100644
--- a/srcpkgs/python3-marisa-trie/template
+++ b/srcpkgs/python3-marisa-trie/template
@@ -1,7 +1,7 @@
# Template file for 'python3-marisa-trie'
pkgname=python3-marisa-trie
version=0.7.5
-revision=5
+revision=6
wrksrc="marisa-trie-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools python3-Cython"
@@ -14,6 +14,11 @@ changelog="https://raw.githubusercontent.com/pytries/marisa-trie/master/CHANGES.
distfiles="${PYPI_SITE}/m/marisa-trie/marisa-trie-${version}.tar.gz"
checksum=c73bc25d868e8c4ea7aa7f1e19892db07bba2463351269b05340ccfa06eb2baf
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
+
pre_build() {
rm -f src/marisa_trie.cpp
cython src/*.pyx src/*.pxd --cplus
From 0efa65a703c0593881af5b12b8fa4c7ad5aa915d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:09:56 -0500
Subject: [PATCH 21/40] python3-pluggy: specify all python3 hostmakedepends
---
srcpkgs/python3-pluggy/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pluggy/template b/srcpkgs/python3-pluggy/template
index c0b4b1c2bc8..1f615db5217 100644
--- a/srcpkgs/python3-pluggy/template
+++ b/srcpkgs/python3-pluggy/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pluggy'
pkgname=python3-pluggy
version=0.13.1
-revision=5
+revision=6
wrksrc="pluggy-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3"
checkdepends="python3-pytest"
short_desc="Minimalist production ready plugin system (Python3)"
From bd0626b9b4cf6b2a6a0c1be31db890fc97d2fe50 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:14 -0500
Subject: [PATCH 22/40] python3-portend: specify all python3 hostmakedepends
---
srcpkgs/python3-portend/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-portend/template b/srcpkgs/python3-portend/template
index b3b889ce16a..27b2642a28e 100644
--- a/srcpkgs/python3-portend/template
+++ b/srcpkgs/python3-portend/template
@@ -1,10 +1,10 @@
# Template file for 'python3-portend'
pkgname=python3-portend
version=2.7.0
-revision=1
+revision=2
wrksrc="portend-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools_scm"
+hostmakedepends="python3-setuptools_scm python3-toml"
depends="python3-tempora python3-jaraco.functools"
short_desc="TCP port monitoring utilities (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3265aa40f48c3182fc3536bed17b9c7422804947 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:26 -0500
Subject: [PATCH 23/40] python3-pylast: specify all python3 hostmakedepends
---
srcpkgs/python3-pylast/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pylast/template b/srcpkgs/python3-pylast/template
index 2f37811d5ab..bc82ff5514d 100644
--- a/srcpkgs/python3-pylast/template
+++ b/srcpkgs/python3-pylast/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pylast'
pkgname=python3-pylast
version=4.1.0
-revision=1
+revision=2
wrksrc="pylast-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3"
short_desc="Python3 interface to last.fm and libre.fm"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
From fb91fa04b5719588132a20f410194667ae3c8fce Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:34 -0500
Subject: [PATCH 24/40] python3-pysol_cards: specify all python3
hostmakedepends
---
srcpkgs/python3-pysol_cards/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pysol_cards/template b/srcpkgs/python3-pysol_cards/template
index f97857216d9..9e992b77956 100644
--- a/srcpkgs/python3-pysol_cards/template
+++ b/srcpkgs/python3-pysol_cards/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pysol_cards'
pkgname=python3-pysol_cards
version=0.10.1
-revision=2
+revision=3
wrksrc="pysol_cards-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pbr"
depends="python3-pbr python3-six"
checkdepends="python3-appdirs python3-attrs python3-colorama python3-coverage
python3-cryptography python3-dogpile.cache python3-future python3-jmespath
From a11ce782a281323e1bc306023236a726ec6c0372 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:10:44 -0500
Subject: [PATCH 25/40] python3-pytest-qt: specify all python3 hostmakedepends
---
srcpkgs/python3-pytest-qt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pytest-qt/template b/srcpkgs/python3-pytest-qt/template
index ab870da8e06..0325ffe5611 100644
--- a/srcpkgs/python3-pytest-qt/template
+++ b/srcpkgs/python3-pytest-qt/template
@@ -1,10 +1,10 @@
# Template file for 'python3-pytest-qt'
pkgname=python3-pytest-qt
version=3.3.0
-revision=2
+revision=3
wrksrc=pytest-qt-${version}
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-pytest"
checkdepends="$depends python3-pyside2 python3-PyQt5 python3-pytest-xvfb
xdpyinfo"
From dbe16d3da1bcbbb726eae62c3fdb8e75be561a75 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:34 -0500
Subject: [PATCH 26/40] python3-rebulk: specify all python3 hostmakedepends
---
srcpkgs/python3-rebulk/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/python3-rebulk/template b/srcpkgs/python3-rebulk/template
index 42118c4629a..3d620df0c61 100644
--- a/srcpkgs/python3-rebulk/template
+++ b/srcpkgs/python3-rebulk/template
@@ -1,7 +1,7 @@
# Template file for 'python3-rebulk'
pkgname=python3-rebulk
version=2.0.1
-revision=3
+revision=4
wrksrc="rebulk-${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -13,6 +13,11 @@ homepage="https://github.com/Toilal/rebulk"
distfiles="${PYPI_SITE}/r/rebulk/rebulk-${version}.tar.gz"
checksum=320ded3cc456347d828f95e9aa5f8bab77ac01943cad024c06012069fe19690a
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e "/setup_requires/s/['\"]pytest-runner['\"],*//" -i setup.py
+}
+
post_install() {
vlicense LICENSE
}
From 4913f3830091f35e5d32a1965171c85cbc789db4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:44 -0500
Subject: [PATCH 27/40] python3-testtools: specify all python3 hostmakedepends
---
srcpkgs/python3-testtools/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-testtools/template b/srcpkgs/python3-testtools/template
index 43500391a4f..3fcae7eec93 100644
--- a/srcpkgs/python3-testtools/template
+++ b/srcpkgs/python3-testtools/template
@@ -1,10 +1,10 @@
# Template file for 'python3-testtools'
pkgname=python3-testtools
version=2.4.0
-revision=2
+revision=3
wrksrc="testtools-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools python3-pbr"
short_desc="Python3 standard library unit testing framework"
maintainer="Alex Childs <misuchiru03+void@gmail.com>"
license="MIT"
From cbe3ae390930dd34c51ab0e67d564b56b323d2e4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:11:54 -0500
Subject: [PATCH 28/40] python3-treq: specify all python3 hostmakedepends
---
srcpkgs/python3-treq/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-treq/template b/srcpkgs/python3-treq/template
index 21a11977189..977b97fb642 100644
--- a/srcpkgs/python3-treq/template
+++ b/srcpkgs/python3-treq/template
@@ -1,11 +1,11 @@
# Template file for 'python3-treq'
pkgname=python3-treq
version=20.3.0
-revision=2
+revision=3
wrksrc="treq-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
-depends="python3-incremental python3-requests>=2.1.0 python3-six
+hostmakedepends="python3-setuptools python3-incremental"
+depends="python3-incremental python3-requests python3-six
python3-Twisted python3-attrs"
short_desc="Requests-like API built on top of twisted.web's Agent"
maintainer="Orphaned <orphan@voidlinux.org>"
From e0a1ab1ceee8eeb64198c6b86b78bc591b20d673 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:12:07 -0500
Subject: [PATCH 29/40] python3-zope.security: specify all python3
hostmakedepends
---
srcpkgs/python3-zope.security/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-zope.security/template b/srcpkgs/python3-zope.security/template
index 5cc8e5c95dc..73a82360ce0 100644
--- a/srcpkgs/python3-zope.security/template
+++ b/srcpkgs/python3-zope.security/template
@@ -1,10 +1,10 @@
# Template file for 'python3-zope.security'
pkgname=python3-zope.security
version=5.1.1
-revision=2
+revision=3
wrksrc="zope.security-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools python3-distutils-extra"
+hostmakedepends="python3-setuptools python3-zope.proxy"
makedepends="python3-devel"
depends="python3-zope.component python3-zope.configuration python3-zope.testing
python3-zope.testrunner python3-zope.location"
From 32ebc609d345571bae2be8055995dbc8929fffd9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 11:14:44 -0500
Subject: [PATCH 30/40] python3-numexpr: fix checksum
---
srcpkgs/python3-numexpr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-numexpr/template b/srcpkgs/python3-numexpr/template
index 31984949e5e..16f21540547 100644
--- a/srcpkgs/python3-numexpr/template
+++ b/srcpkgs/python3-numexpr/template
@@ -1,7 +1,7 @@
# Template file for 'python3-numexpr'
pkgname=python3-numexpr
version=2.7.2
-revision=1
+revision=2
wrksrc="numexpr-${version}"
build_style=python3-module
build_helper=numpy
@@ -13,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/pydata/numexpr"
distfiles="https://github.com/pydata/numexpr/archive/v${version}.tar.gz"
-checksum=c939f806c179e9fcb80100f3cd32a748d14a6101c29fb102cc77844549c88291
+checksum=7d1b3790103221feda07f4a93a4fa5c6654f46865197a677ca6f27eb5cb4e5ef
post_install() {
vlicense LICENSE.txt
From 8c09d487ba1b48256c14d8890d72a8f38c41c825 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:39:08 -0500
Subject: [PATCH 31/40] nagstamon: fix checksum
---
srcpkgs/nagstamon/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nagstamon/template b/srcpkgs/nagstamon/template
index bf07c6d1bce..a3e92bfa761 100644
--- a/srcpkgs/nagstamon/template
+++ b/srcpkgs/nagstamon/template
@@ -1,10 +1,9 @@
# Template file for 'nagstamon'
pkgname=nagstamon
version=3.4.1
-revision=1
+revision=2
wrksrc=Nagstamon
build_style=python3-module
-pycompile_module="Nagstamon"
hostmakedepends="python3-setuptools python3-keyring python3-psutil"
depends="python3-BeautifulSoup4 python3-dbus python3-keyring python3-lxml
python3-psutil python3-PyQt5-multimedia python3-PyQt5-svg python3-requests"
@@ -13,7 +12,7 @@ maintainer="Laszlo Dvornik <laulicus@zoho.com>"
license="GPL-2.0-or-later"
homepage="https://nagstamon.ifw-dresden.de"
distfiles="https://nagstamon.ifw-dresden.de/files/stable/Nagstamon-${version}.tar.gz"
-checksum=2d26cf4d64a6e27fe55f1c5e5f042af511bcb09876ae16a456aee5800a98adea
+checksum=7a9611f40b08269bba4100ab2598ee089c7d0ebc6c4e9d7132689342f71150ec
post_patch() {
# This relies on /etc/os-release, which doesn't exist without
From 16941792cc360132adab66a97569ac207bcde14d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 32/40] duplicity: specify all python3 hostmakedepends
---
srcpkgs/duplicity/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/duplicity/template b/srcpkgs/duplicity/template
index fa066c26750..85bfe131638 100644
--- a/srcpkgs/duplicity/template
+++ b/srcpkgs/duplicity/template
@@ -1,9 +1,9 @@
# Template file for 'duplicity'
pkgname=duplicity
version=0.8.18
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="gettext python3-setuptools"
+hostmakedepends="gettext python3-setuptools_scm"
makedepends="python3-devel librsync-devel"
depends="python3-fasteners gnupg python3-future python3-urllib3"
short_desc="Encrypted bandwidth-efficient backup using the rsync algorithm"
From 1a30f9236be7d1cc306e9cf07873a49aa04c572e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 33/40] fava: specify all python3 hostmakedepends
---
srcpkgs/fava/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fava/template b/srcpkgs/fava/template
index a5463088647..0478e011501 100644
--- a/srcpkgs/fava/template
+++ b/srcpkgs/fava/template
@@ -1,9 +1,9 @@
# Template file for 'fava'
pkgname=fava
version=1.17
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-Babel python3-Cheroot python3-Flask-Babel python3-Flask
python3-Jinja2 beancount python3-click python3-markdown2 python3-ply
python3-simplejson python3-Werkzeug python3-aiohttp"
From 186a0d51a5f876f8372af9d78a96b2df36703d9a Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 34/40] khard: specify all python3 hostmakedepends
---
srcpkgs/khard/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/khard/template b/srcpkgs/khard/template
index da57783e4e6..cdbaa5b0b6f 100644
--- a/srcpkgs/khard/template
+++ b/srcpkgs/khard/template
@@ -1,9 +1,9 @@
# Template file for 'khard'
pkgname=khard
version=0.17.0
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-setuptools python3-atomicwrites python3-configobj
python3-vobject python3-Unidecode python3-ruamel.yaml"
short_desc="Command-line addressbook built around CardDAV"
From 109f64c1c0321e1b1994290ddc17ddf0b5f811f9 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 35/40] protontricks: specify all python3 hostmakedepends
---
srcpkgs/protontricks/template | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/protontricks/template b/srcpkgs/protontricks/template
index d53364f804a..306a6c7e2d6 100644
--- a/srcpkgs/protontricks/template
+++ b/srcpkgs/protontricks/template
@@ -1,10 +1,9 @@
# Template file for 'protontricks'
pkgname=protontricks
version=1.4.3
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools"
-makedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-vdf winetricks"
short_desc="Simple wrapper that does winetricks things for Proton enabled games"
maintainer="Orphaned <orphan@voidlinux.org>"
From e06a3a7c52dcf98e5957f28d280dc4521678435b Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:20 -0500
Subject: [PATCH 36/40] python-b2sdk: specify all python3 hostmakedepends
---
srcpkgs/python-b2sdk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python-b2sdk/template b/srcpkgs/python-b2sdk/template
index d394714962d..838d3c2fb89 100644
--- a/srcpkgs/python-b2sdk/template
+++ b/srcpkgs/python-b2sdk/template
@@ -2,10 +2,10 @@
# keep python-b2sdk name to revert this package
pkgname=python-b2sdk
version=1.3.0
-revision=1
+revision=2
wrksrc="b2sdk-${version}"
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-logfury python3-Arrow python3-requests python3-six"
checkdepends="python3-pytest $depends python3-dateutil python3-nose
python3-mock python3-tqdm python3-pyflakes"
From 538d78742b356430325bbaee6d5ec5cdade82d4d Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 37/40] rdiff-backup: specify all python3 hostmakedepends
---
srcpkgs/rdiff-backup/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rdiff-backup/template b/srcpkgs/rdiff-backup/template
index 752c58e6cbc..a237dd4ce4c 100644
--- a/srcpkgs/rdiff-backup/template
+++ b/srcpkgs/rdiff-backup/template
@@ -1,11 +1,11 @@
# Template file for 'rdiff-backup'
pkgname=rdiff-backup
version=2.0.5
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3 python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel librsync-devel"
-depends="python3 python3-pyxattr"
+depends="python3-pyxattr"
short_desc="Local/remote mirroring and incremental backups"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="GPL-2.0-or-later"
From a7397399931c59aab43ed6d800e3e0e6418f1354 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 38/40] terminator: specify all python3 hostmakedepends
---
srcpkgs/terminator/template | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/terminator/template b/srcpkgs/terminator/template
index db55cc6c38c..c29cbc4a756 100644
--- a/srcpkgs/terminator/template
+++ b/srcpkgs/terminator/template
@@ -1,7 +1,7 @@
# Template file for 'terminator'
pkgname=terminator
version=2.0.1
-revision=1
+revision=2
build_style=python3-module
hostmakedepends="intltool python3-setuptools"
depends="desktop-file-utils gsettings-desktop-schemas libkeybinder3 libnotify
@@ -13,3 +13,8 @@ homepage="https://gnome-terminator.org"
changelog="https://raw.githubusercontent.com/gnome-terminator/terminator/master/CHANGELOG.md"
distfiles="https://github.com/gnome-terminator/terminator/releases/download/v$version/terminator-$version.tar.gz"
checksum=e6a21ea18c48b9dcb8fac3b48fd90bc49768de13c2a749047c46a6e0f14abb24
+
+post_patch() {
+ # Package does not *need* pytest-runner to build, and Void doesn't have it
+ vsed -e '/pytest-runner/d' -i setup.py
+}
From 0e5ac8d384e8e2bb1afb61293d2a8e6b10fcea64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 39/40] todoman: specify all python3 hostmakedepends
---
srcpkgs/todoman/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/todoman/template b/srcpkgs/todoman/template
index 4eecfc758b2..1236479016a 100644
--- a/srcpkgs/todoman/template
+++ b/srcpkgs/todoman/template
@@ -1,9 +1,9 @@
# Template file for 'todoman'
pkgname=todoman
version=3.8.0
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
depends="python3-icalendar python3-urwid python3-xdg python3-parsedatetime
python3-atomicwrites python3-click-repl python3-configobj python3-click-log
python3-dateutil python3-tabulate python3-humanize"
From 735e1ff35fd28eae88c07e095cc0dabdeb695725 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 28 Jan 2021 14:48:21 -0500
Subject: [PATCH 40/40] whipper: specify all python3 hostmakedepends
---
srcpkgs/whipper/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/whipper/template b/srcpkgs/whipper/template
index 03e5b89030b..8826ee845ab 100644
--- a/srcpkgs/whipper/template
+++ b/srcpkgs/whipper/template
@@ -1,9 +1,9 @@
# Template file for 'whipper'
pkgname=whipper
version=0.9.0
-revision=2
+revision=3
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="libsndfile-devel python3-devel"
depends="libcdio-paranoia cdrdao python3-gobject python3-musicbrainzngs
python3-mutagen python3-requests python3-pycdio python3-discid
next prev parent reply other threads:[~2021-01-28 20:03 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 15:21 [PR PATCH] " ahesford
2021-01-28 13:10 ` ahesford
2021-01-28 14:20 ` ahesford
2021-01-28 14:20 ` ahesford
2021-01-28 14:20 ` ahesford
2021-01-28 14:20 ` ahesford
2021-01-28 14:44 ` ahesford
2021-01-28 14:48 ` ahesford
2021-01-28 15:43 ` ahesford
2021-01-28 15:44 ` [PR PATCH] [Updated] " ahesford
2021-01-28 16:02 ` ahesford
2021-01-28 16:03 ` ahesford
2021-01-28 16:15 ` ahesford
2021-01-28 16:15 ` [PR PATCH] [Updated] " ahesford
2021-01-28 19:36 ` ahesford
2021-01-28 19:50 ` [PR PATCH] [Updated] " ahesford
2021-01-28 19:51 ` ahesford
2021-01-28 20:03 ` ahesford [this message]
2021-01-28 20:08 ` [PR PATCH] [Closed]: " ahesford
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=20210128200341.ZnRRb31bPoL85FsM5AEaKhcmNKPWkEL4VcIk52L1zc4@z \
--to=ahesford@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).