diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-03-14 00:51:45 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-03-14 00:51:45 +0000 |
| commit | 3e3d50dea42f66b1ba457411b8864990f90bbe21 (patch) | |
| tree | 7d75df352fc045a84d46764b96b496b5775bbf44 /contrib/python | |
| parent | 7778cd274683ce11e318b799ea12c7bc0b3a4bdd (diff) | |
| parent | 422642b601155a296cb0a69eb9b1f7ba146ffa49 (diff) | |
| download | ydb-3e3d50dea42f66b1ba457411b8864990f90bbe21.tar.gz | |
Merge branch 'rightlib' into merge-libs-250314-0050
Diffstat (limited to 'contrib/python')
| -rw-r--r-- | contrib/python/setuptools/py3/.dist-info/METADATA | 2 | ||||
| -rw-r--r-- | contrib/python/setuptools/py3/pkg_resources/__init__.py | 17 | ||||
| -rw-r--r-- | contrib/python/setuptools/py3/ya.make | 2 |
3 files changed, 13 insertions, 8 deletions
diff --git a/contrib/python/setuptools/py3/.dist-info/METADATA b/contrib/python/setuptools/py3/.dist-info/METADATA index b947a7318fe..2b81ee9bd49 100644 --- a/contrib/python/setuptools/py3/.dist-info/METADATA +++ b/contrib/python/setuptools/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.2 Name: setuptools -Version: 75.8.1 +Version: 75.8.2 Summary: Easily download, build, install, upgrade, and uninstall Python packages Author-email: Python Packaging Authority <distutils-sig@python.org> Project-URL: Source, https://github.com/pypa/setuptools diff --git a/contrib/python/setuptools/py3/pkg_resources/__init__.py b/contrib/python/setuptools/py3/pkg_resources/__init__.py index df522e5b86a..b25c6c1f656 100644 --- a/contrib/python/setuptools/py3/pkg_resources/__init__.py +++ b/contrib/python/setuptools/py3/pkg_resources/__init__.py @@ -708,14 +708,19 @@ class WorkingSet: If there is no active distribution for the requested project, ``None`` is returned. """ - dist = self.by_key.get(req.key) + dist: Distribution | None = None - if dist is None: - canonical_key = self.normalized_to_canonical_keys.get(req.key) + candidates = ( + req.key, + self.normalized_to_canonical_keys.get(req.key), + safe_name(req.key).replace(".", "-"), + ) - if canonical_key is not None: - req.key = canonical_key - dist = self.by_key.get(canonical_key) + for candidate in filter(None, candidates): + dist = self.by_key.get(candidate) + if dist: + req.key = candidate + break if dist is not None and dist not in req: # XXX add more info diff --git a/contrib/python/setuptools/py3/ya.make b/contrib/python/setuptools/py3/ya.make index 24de6a7a6d7..d28ff13d742 100644 --- a/contrib/python/setuptools/py3/ya.make +++ b/contrib/python/setuptools/py3/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(75.8.1) +VERSION(75.8.2) LICENSE(MIT) |