CVS commit: pkgsrc/devel/py-ruamel-yaml

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Apr  7 23:44:11 UTC 2025

Modified Files:
        pkgsrc/devel/py-ruamel-yaml: Makefile

Log Message:
devel/py-ruamel-yaml: Fix wheel name harder

setuptools has vendored wheel; vendored wheel and newer real wheel
disagree on handling of '.'.  Force real wheel, until we have new
setuptools with newer vendored wheel.

(Specific problem found by wiz@; my prediction of more likely than not
to recur took only 31 minutes to come true.)


To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 pkgsrc/devel/py-ruamel-yaml/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/py-ruamel-yaml/Makefile
diff -u pkgsrc/devel/py-ruamel-yaml/Makefile:1.44 pkgsrc/devel/py-ruamel-yaml/Makefile:1.45
--- pkgsrc/devel/py-ruamel-yaml/Makefile:1.44   Mon Apr  7 23:04:28 2025
+++ pkgsrc/devel/py-ruamel-yaml/Makefile        Mon Apr  7 23:44:11 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2025/04/07 23:04:28 gdt Exp $
+# $NetBSD: Makefile,v 1.45 2025/04/07 23:44:11 gdt Exp $
 
 DISTNAME=      ruamel.yaml-0.18.10
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/./-/1}
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    devel python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=r/ruamel.yaml/}
 
@@ -14,13 +14,14 @@ LICENSE=    mit
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=      ${PYPKGPREFIX}-ruamel-yaml-clib>=0.2.7:../../devel/py-ruamel-yaml-clib
 
-# The distfile uses '.' and the pkgsrc package uses '-'.
-
-# The wheel intends to use '.', but with up-to-date pkgsrc (and
-# perhaps more packages installed than strictly required), the wheel
-# used '_'.  This is perhaps related to a pending renamed requested by
-# PyPI.
-#WHEEL_NAME=   ${DISTNAME:S/./_/1}
+# The distfile uses '.' and the pkgsrc package uses '-'.  The
+# wheelname uses '.' with old wheel code, such as is vendored in
+# setuptools 75, and '_' with wheel >=0.45.1 (and likely setuptools
+# 76).  Until then, force wheel so that the new code is used.
+# (Afterwards, drop the TOOL_DEPENDS, keep WHEEL_NAME, and rewrite the
+# comment.)
+TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0.45.1:../../devel/py-wheel
+WHEEL_NAME=    ${DISTNAME:S/./_/1}
 
 USE_LANGUAGES= # none