From e74607e1a07a3acd8313d72d2d174065da924c21 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Wed, 27 Jan 2021 10:13:39 -0500 Subject: [PATCH 01/11] 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 f40c540e94471f646f30c9e3ce475de5a7b7dedc Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 09:02:46 -0500 Subject: [PATCH 02/11] python3-Flask-User: fix 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 " license="MIT" From 97ba79778d8ab21514cdfc2564d3932791e9aed6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 09:02:53 -0500 Subject: [PATCH 03/11] python3-PGPy: fix 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 " license="BSD-3-Clause" From c9742afcf84c8796b35d37301445711d4bbf96b8 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 09:08:52 -0500 Subject: [PATCH 04/11] python3-aiohttp-sse-client: fix 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 2dfd309470c33017efb4017c814915fb07ec8206 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 09:34:07 -0500 Subject: [PATCH 05/11] python3-audioread: fix 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 6e6b635587985d56aabffcf69c0844214b0dc69a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 09:47:47 -0500 Subject: [PATCH 06/11] python-dateutil: fix hostmakedepends --- srcpkgs/python-dateutil/template | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python-dateutil/template b/srcpkgs/python-dateutil/template index bfeef65df2b..562e8e73484 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 " From 6f53a96cd4fe2ab0617e810944f6e3af89a4d78a Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 09:52:21 -0500 Subject: [PATCH 07/11] python3-ffmpeg-python: fix 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..5c55aead292 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 '/setup_requires/d' -i setup.py +} From 8e59222094b1bccaa1c42f814674f203161b0f96 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 10:37:38 -0500 Subject: [PATCH 08/11] python3-gitchangelog: fix 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 " From fe78efc3a7f3c44518fa9ede618c51c762b17ef7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 10:23:11 -0500 Subject: [PATCH 09/11] 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 " 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 288be88679265fb3227c48090a3d37d43c3bfec7 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 10:41:55 -0500 Subject: [PATCH 10/11] python3-guessit: fix 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 3af6c468debf49c15dc256a83bd8a2f2e87112f0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 10:43:25 -0500 Subject: [PATCH 11/11] python3-humanize: fix 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 "