From 5f500c3e73ac50d063137eb084447b0935905157 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 28 Jan 2021 10:37:38 -0500 Subject: [PATCH] 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 0000000000..efc271d01e --- /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 0000000000..c9f5b7ced2 --- /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 c62eecee9a..348dc2c83b 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 "