From nobody Thu Apr 10 17:50:36 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZYS5m27PTz5tGPR; Thu, 10 Apr 2025 17:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZYS5m1RZYz3JV9; Thu, 10 Apr 2025 17:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744307436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqEoxRoJp8bte/k1CHNP+eimCcwfExK7su2DO3/aQnQ=; b=i67H4Nh/vt+JAdUM+mQSpX+IUBTa9jEVCvuSz/7bDeI+D/NDKOeRUq1xHOJferjoOaZKP/ k9tNeIyRrclzfAXNG/2cGwIpTKPuEm9dvwmsjcE3yJ+QFF+49Dt5/oj7hspSIbhzJVBv/V w5FjlKRdAkEs9+L+MKy6yA5p+RtO1bqwa3x6Jn9kmfz9qjCHCzn5hVL5RDvfHhHQFX28V2 mc8Zjd/w5+I2NbDc0SpL0ovFqpxdHr7iZqgusa87p9JhJqA6Mvl4+eVwEw7iF0u9IaM2/E HKNUOEKQxbe3LL1osFpGe0+IDG6TfmYE+30DttZiXG79o1fYlUrUVMwcjm8a0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744307436; a=rsa-sha256; cv=none; b=cBuCT46jYiv3IkormkQrzLOpV8G7LswSLCh3xGMuObk7AR5ZYS1ck9aqHgiv6wpTZKonnl /bGA3KJgiwOHe2EYifTDeW5R3ZGGffF8tdFiILBJW5SO/BKGh5snw/xIyg3xfmMnnG9g+e 769iS+tCQoxruNX7A1hAL4X1EoGtnEYcJg1oAx9UchDE6ye7CDkxdqEZXtAq+jBvr5OTuo PguQGPKD+kJp7B7Kn9gPiOjvOhQ2tVIMu5gyGaeUksHb1SPiXoH0mx/Ex55YsXhsM4Gfdz mQKTjCSUoYcCWa2BvwVZP0SdiQZ5JKG/PXr5Bxl9dB0zwAsKP+eCVuCly7WJUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744307436; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JqEoxRoJp8bte/k1CHNP+eimCcwfExK7su2DO3/aQnQ=; b=UpybfSzBhIfdJMRa81avefzm0fK/9HPtwNPamB1Mz0RO2a66CEBvHktJAl3uxZDpBWwXRL w05Cb6NObVVrGBOxfFR0m4ygYsSgjPtRVI+yJH2fHOHZE2WVWX/XtQZBGWtYS2bPtWBfIx 53QxwJ0p4Ky4dZKZAALrekupBLBnqICljJbPKWkbUWPEeD/zcDcMhHvHJ5pwilAGKVUUbx 0HpwZIbzmJpvbdjVc9UwJrcB+KC1qMYX6FvDrKE/53WGDFErbQNAiMYgbsNHLZ2iinBkt5 bO6YxRU5gTGA6kCAbx7VOHqyuQak3ZKxL2BEPoQCX6LWPVr632HxIiCfqB3yEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZYS5m0vXDz1CGS; Thu, 10 Apr 2025 17:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53AHoaXj087500; Thu, 10 Apr 2025 17:50:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53AHoaEk087497; Thu, 10 Apr 2025 17:50:36 GMT (envelope-from git) Date: Thu, 10 Apr 2025 17:50:36 GMT Message-Id: <202504101750.53AHoaEk087497@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: c4dd8f401752 - main - devel/py-setuptools@py39: add py39 compat layer to vendored importlib-metadata List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4dd8f40175252743857e936c56c1c8740202230 Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=c4dd8f40175252743857e936c56c1c8740202230 commit c4dd8f40175252743857e936c56c1c8740202230 Author: Charlie Li AuthorDate: 2025-04-10 17:41:54 +0000 Commit: Charlie Li CommitDate: 2025-04-10 17:50:23 +0000 devel/py-setuptools@py39: add py39 compat layer to vendored importlib-metadata ...and partially revert a setuptools commit exposing another error. Context: https://github.com/pypa/setuptools/issues/3452 Reported by: Niels Kobschätzki PR: 285909 --- devel/py-setuptools/Makefile | 8 +++- ...ls___vendor_importlib__metadata_____init____.py | 41 +++++++++++++++++ ...ls___vendor_importlib__metadata___py39compat.py | 51 ++++++++++++++++++++++ .../files/py39/patch-setuptools_dist.py | 14 ++++++ 4 files changed, 113 insertions(+), 1 deletion(-) diff --git a/devel/py-setuptools/Makefile b/devel/py-setuptools/Makefile index f8441337aa21..3cd00ac478de 100644 --- a/devel/py-setuptools/Makefile +++ b/devel/py-setuptools/Makefile @@ -29,4 +29,10 @@ CPE_VENDOR= python NO_ARCH= yes -.include +.include + +.if ${PYTHON_REL} < 31000 +EXTRA_PATCHES+= ${PATCHDIR}/py39 +.endif + +.include diff --git a/devel/py-setuptools/files/py39/patch-setuptools___vendor_importlib__metadata_____init____.py b/devel/py-setuptools/files/py39/patch-setuptools___vendor_importlib__metadata_____init____.py new file mode 100644 index 000000000000..70368aad04ff --- /dev/null +++ b/devel/py-setuptools/files/py39/patch-setuptools___vendor_importlib__metadata_____init____.py @@ -0,0 +1,41 @@ +--- setuptools/_vendor/importlib_metadata/__init__.py.orig 2022-07-04 02:25:25 UTC ++++ setuptools/_vendor/importlib_metadata/__init__.py +@@ -14,7 +14,7 @@ import collections + import posixpath + import collections + +-from . import _adapters, _meta ++from . import _adapters, _meta, _py39compat + from ._collections import FreezableDefaultDict, Pair + from ._compat import ( + NullFinder, +@@ -180,6 +180,10 @@ class EntryPoint(DeprecatedTuple): + following the attr, and following any extras. + """ + ++ name: str ++ value: str ++ group: str ++ + dist: Optional['Distribution'] = None + + def __init__(self, name, value, group): +@@ -350,7 +354,8 @@ class EntryPoints(DeprecatedList): + Select entry points from self that match the + given parameters (typically group and/or name). + """ +- return EntryPoints(ep for ep in self if ep.matches(**params)) ++ candidates = (_py39compat.ep_matches(ep, **params) for ep in self) ++ return EntryPoints(ep for ep, predicate in candidates if predicate) + + @property + def names(self): +@@ -991,7 +996,7 @@ def entry_points(**params) -> Union[EntryPoints, Selec + + :return: EntryPoints or SelectableGroups for all installed packages. + """ +- norm_name = operator.attrgetter('_normalized_name') ++ norm_name = _py39compat.normalized_name + unique = functools.partial(unique_everseen, key=norm_name) + eps = itertools.chain.from_iterable( + dist.entry_points for dist in unique(distributions()) diff --git a/devel/py-setuptools/files/py39/patch-setuptools___vendor_importlib__metadata___py39compat.py b/devel/py-setuptools/files/py39/patch-setuptools___vendor_importlib__metadata___py39compat.py new file mode 100644 index 000000000000..ce7b7d034c54 --- /dev/null +++ b/devel/py-setuptools/files/py39/patch-setuptools___vendor_importlib__metadata___py39compat.py @@ -0,0 +1,51 @@ +--- setuptools/_vendor/importlib_metadata/_py39compat.py.orig 2025-04-10 14:12:41 UTC ++++ setuptools/_vendor/importlib_metadata/_py39compat.py +@@ -0,0 +1,48 @@ ++""" ++Compatibility layer with Python 3.8/3.9 ++""" ++from typing import TYPE_CHECKING, Any, Optional, Tuple ++ ++if TYPE_CHECKING: # pragma: no cover ++ # Prevent circular imports on runtime. ++ from . import Distribution, EntryPoint ++else: ++ Distribution = EntryPoint = Any ++ ++ ++def normalized_name(dist: Distribution) -> Optional[str]: ++ """ ++ Honor name normalization for distributions that don't provide ``_normalized_name``. ++ """ ++ try: ++ return dist._normalized_name ++ except AttributeError: ++ from . import Prepared # -> delay to prevent circular imports. ++ ++ return Prepared.normalize(getattr(dist, "name", None) or dist.metadata['Name']) ++ ++ ++def ep_matches(ep: EntryPoint, **params) -> Tuple[EntryPoint, bool]: ++ """ ++ Workaround for ``EntryPoint`` objects without the ``matches`` method. ++ For the sake of convenience, a tuple is returned containing not only the ++ boolean value corresponding to the predicate evalutation, but also a compatible ++ ``EntryPoint`` object that can be safely used at a later stage. ++ ++ For example, the following sequences of expressions should be compatible: ++ ++ # Sequence 1: using the compatibility layer ++ candidates = (_py39compat.ep_matches(ep, **params) for ep in entry_points) ++ [ep for ep, predicate in candidates if predicate] ++ ++ # Sequence 2: using Python 3.9+ ++ [ep for ep in entry_points if ep.matches(**params)] ++ """ ++ try: ++ return ep, ep.matches(**params) ++ except AttributeError: ++ from . import EntryPoint # -> delay to prevent circular imports. ++ ++ # Reconstruct the EntryPoint object to make sure it is compatible. ++ _ep = EntryPoint(ep.name, ep.value, ep.group) ++ return _ep, _ep.matches(**params) diff --git a/devel/py-setuptools/files/py39/patch-setuptools_dist.py b/devel/py-setuptools/files/py39/patch-setuptools_dist.py new file mode 100644 index 000000000000..d84f76b41162 --- /dev/null +++ b/devel/py-setuptools/files/py39/patch-setuptools_dist.py @@ -0,0 +1,14 @@ +--- setuptools/dist.py.orig 2022-07-04 02:25:25 UTC ++++ setuptools/dist.py +@@ -777,8 +777,9 @@ class Distribution(_Distribution): + + def _setuptools_commands(self): + try: +- return metadata.distribution('setuptools').entry_points.names +- except metadata.PackageNotFoundError: ++ dist = pkg_resources.get_distribution('setuptools') ++ return list(dist.get_entry_map('distutils.commands')) ++ except pkg_resources.DistributionNotFound: + # during bootstrapping, distribution doesn't exist + return [] +