CVS commit: pkgsrc/devel/py-build

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Sep  8 11:47:22 UTC 2023

Modified Files:
        pkgsrc/devel/py-build: Makefile distinfo
Added Files:
        pkgsrc/devel/py-build/patches: patch-pyproject.toml

Log Message:
py-build: remove unneeded dependency

Fixes dependency cycle.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/py-build/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-build/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-build/patches/patch-pyproject.toml

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-build/Makefile
diff -u pkgsrc/devel/py-build/Makefile:1.14 pkgsrc/devel/py-build/Makefile:1.15
--- pkgsrc/devel/py-build/Makefile:1.14 Thu Sep  7 12:07:18 2023
+++ pkgsrc/devel/py-build/Makefile      Fri Sep  8 11:47:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2023/09/07 12:07:18 adam Exp $
+# $NetBSD: Makefile,v 1.15 2023/09/08 11:47:22 wiz Exp $
 
 DISTNAME=      build-1.0.3
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -20,9 +20,7 @@ USE_PKG_RESOURCES=    yes
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
 .include "../../lang/python/pyversion.mk"
-.if ${PYTHON_VERSION} < 310
-DEPENDS+=      ${PYPKGPREFIX}-importlib-metadata>=4.6:../../devel/py-importlib-metadata
-.endif
+
 .if ${PYTHON_VERSION} < 311
 DEPENDS+=      ${PYPKGPREFIX}-tomli>=1.0.0:../../textproc/py-tomli
 .endif

Index: pkgsrc/devel/py-build/distinfo
diff -u pkgsrc/devel/py-build/distinfo:1.5 pkgsrc/devel/py-build/distinfo:1.6
--- pkgsrc/devel/py-build/distinfo:1.5  Thu Sep  7 12:07:18 2023
+++ pkgsrc/devel/py-build/distinfo      Fri Sep  8 11:47:22 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2023/09/07 12:07:18 adam Exp $
+$NetBSD: distinfo,v 1.6 2023/09/08 11:47:22 wiz Exp $
 
 BLAKE2s (build-1.0.3.tar.gz) = c23531fe44e38f5df21d19ca2bc7b0471a3677ec7d69d3afa324d7db56f39fb6
 SHA512 (build-1.0.3.tar.gz) = 92179348078647c3162ca6fe2cc1ab374469ab1336feccc5486b50274014f4773006eb50d8d3300390f1442da474424c45002a71ce155b35d7f2b3c5b754a1bd
 Size (build-1.0.3.tar.gz) = 40797 bytes
+SHA1 (patch-pyproject.toml) = 738af4911106b9c7701bf50dd01105edb7ba9fdb

Added files:

Index: pkgsrc/devel/py-build/patches/patch-pyproject.toml
diff -u /dev/null pkgsrc/devel/py-build/patches/patch-pyproject.toml:1.1
--- /dev/null   Fri Sep  8 11:47:22 2023
+++ pkgsrc/devel/py-build/patches/patch-pyproject.toml  Fri Sep  8 11:47:22 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-pyproject.toml,v 1.1 2023/09/08 11:47:22 wiz Exp $
+
+pkgsrc only has Python 3.8+, so the dependency is not needed.
+(It introduces a dependency cycle.)
+
+--- pyproject.toml.orig        2023-09-06 22:31:16.000000000 +0000
++++ pyproject.toml
+@@ -36,7 +36,6 @@ dependencies = [
+   "pyproject_hooks",
+   # not actually a runtime dependency, only supplied as there is not "recommended dependency" support
+   'colorama; os_name == "nt"',
+-  'importlib-metadata >= 4.6; python_version < "3.10"',  # Not required for 3.8+, but fixes a stdlib bug
+   'tomli >= 1.1.0; python_version < "3.11"',
+ ]
+