From e688cb5124e774d6b89e2d5745574640bdf134e2 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Mon, 14 Feb 2022 21:48:48 -0500 Subject: [PATCH] Bump importlib_metadata to 4.11.1. Fixes #3107. --- changelog.d/3107.misc.rst | 1 + .../INSTALLER | 0 .../LICENSE | 0 .../METADATA | 6 ++-- .../RECORD | 16 +++++------ .../REQUESTED | 0 .../WHEEL | 0 .../top_level.txt | 0 .../_vendor/importlib_metadata/__init__.py | 28 ++++++++----------- setuptools/_vendor/vendored.txt | 2 +- 10 files changed, 25 insertions(+), 28 deletions(-) create mode 100644 changelog.d/3107.misc.rst rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/INSTALLER (100%) rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/LICENSE (100%) rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/METADATA (95%) rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/RECORD (69%) rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/REQUESTED (100%) rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/WHEEL (100%) rename setuptools/_vendor/{importlib_metadata-4.10.1.dist-info => importlib_metadata-4.11.1.dist-info}/top_level.txt (100%) diff --git a/changelog.d/3107.misc.rst b/changelog.d/3107.misc.rst new file mode 100644 index 0000000000..6a7f776b07 --- /dev/null +++ b/changelog.d/3107.misc.rst @@ -0,0 +1 @@ +Bump importlib_metadata to 4.11.1 addressing issue with parsing requirements in egg-info as found in PyPy. diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/INSTALLER b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/INSTALLER similarity index 100% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/INSTALLER rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/INSTALLER diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/LICENSE b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/LICENSE similarity index 100% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/LICENSE rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/LICENSE diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/METADATA b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/METADATA similarity index 95% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/METADATA rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/METADATA index 7327b8887d..fda4bc75b5 100644 --- a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/METADATA +++ b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: importlib-metadata -Version: 4.10.1 +Version: 4.11.1 Summary: Read metadata from Python packages Home-page: https://github.com/python/importlib_metadata Author: Jason R. Coombs @@ -33,7 +33,7 @@ Requires-Dist: pyfakefs ; extra == 'testing' Requires-Dist: flufl.flake8 ; extra == 'testing' Requires-Dist: pytest-perf (>=0.9.2) ; extra == 'testing' Requires-Dist: pytest-black (>=0.3.7) ; (platform_python_implementation != "PyPy") and extra == 'testing' -Requires-Dist: pytest-mypy ; (platform_python_implementation != "PyPy") and extra == 'testing' +Requires-Dist: pytest-mypy (>=0.9.1) ; (platform_python_implementation != "PyPy") and extra == 'testing' Requires-Dist: importlib-resources (>=1.3) ; (python_version < "3.9") and extra == 'testing' .. image:: https://img.shields.io/pypi/v/importlib_metadata.svg @@ -55,7 +55,7 @@ Requires-Dist: importlib-resources (>=1.3) ; (python_version < "3.9") and extra .. image:: https://readthedocs.org/projects/importlib-metadata/badge/?version=latest :target: https://importlib-metadata.readthedocs.io/en/latest/?badge=latest -.. image:: https://img.shields.io/badge/skeleton-2021-informational +.. image:: https://img.shields.io/badge/skeleton-2022-informational :target: https://blog.jaraco.com/skeleton diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/RECORD b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/RECORD similarity index 69% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/RECORD rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/RECORD index ebedf904ff..d8c2dff628 100644 --- a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/RECORD +++ b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/RECORD @@ -1,11 +1,11 @@ -importlib_metadata-4.10.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 -importlib_metadata-4.10.1.dist-info/LICENSE,sha256=wNe6dAchmJ1VvVB8D9oTc-gHHadCuaSBAev36sYEM6U,571 -importlib_metadata-4.10.1.dist-info/METADATA,sha256=-HDYj3iK6bcjwN5MAoO58Op6WQIYQfbhl6ZaPqL0IZI,3989 -importlib_metadata-4.10.1.dist-info/RECORD,, -importlib_metadata-4.10.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 -importlib_metadata-4.10.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92 -importlib_metadata-4.10.1.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19 -importlib_metadata/__init__.py,sha256=7WxDdbPPu4Wy3VeMTApd-JlPQoENgVDyDH6aqyE7acE,30175 +importlib_metadata-4.11.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4 +importlib_metadata-4.11.1.dist-info/LICENSE,sha256=wNe6dAchmJ1VvVB8D9oTc-gHHadCuaSBAev36sYEM6U,571 +importlib_metadata-4.11.1.dist-info/METADATA,sha256=XNgM09x6V8tbt6ugvKjiUxH9yB7pBdILWuWE5YNWHRw,3999 +importlib_metadata-4.11.1.dist-info/RECORD,, +importlib_metadata-4.11.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0 +importlib_metadata-4.11.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92 +importlib_metadata-4.11.1.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19 +importlib_metadata/__init__.py,sha256=Wkh_tb0u0Ds_615ByV9VLLjqgoOWirwMY8EW40oO3nM,30122 importlib_metadata/__pycache__/__init__.cpython-310.pyc,, importlib_metadata/__pycache__/_adapters.cpython-310.pyc,, importlib_metadata/__pycache__/_collections.cpython-310.pyc,, diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/REQUESTED b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/REQUESTED similarity index 100% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/REQUESTED rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/REQUESTED diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/WHEEL b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/WHEEL similarity index 100% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/WHEEL rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/WHEEL diff --git a/setuptools/_vendor/importlib_metadata-4.10.1.dist-info/top_level.txt b/setuptools/_vendor/importlib_metadata-4.11.1.dist-info/top_level.txt similarity index 100% rename from setuptools/_vendor/importlib_metadata-4.10.1.dist-info/top_level.txt rename to setuptools/_vendor/importlib_metadata-4.11.1.dist-info/top_level.txt diff --git a/setuptools/_vendor/importlib_metadata/__init__.py b/setuptools/_vendor/importlib_metadata/__init__.py index 45541179aa..292e0c6d4a 100644 --- a/setuptools/_vendor/importlib_metadata/__init__.py +++ b/setuptools/_vendor/importlib_metadata/__init__.py @@ -283,6 +283,8 @@ class DeprecatedList(list): 1 """ + __slots__ = () + _warn = functools.partial( warnings.warn, "EntryPoints list interface is deprecated. Cast to list if needed.", @@ -295,21 +297,15 @@ def wrapped(self, *args, **kwargs): self._warn() return getattr(super(), method_name)(*args, **kwargs) - return wrapped - - for method_name in [ - '__setitem__', - '__delitem__', - 'append', - 'reverse', - 'extend', - 'pop', - 'remove', - '__iadd__', - 'insert', - 'sort', - ]: - locals()[method_name] = _wrap_deprecated_method(method_name) + return method_name, wrapped + + locals().update( + map( + _wrap_deprecated_method, + '__setitem__ __delitem__ append reverse extend pop remove ' + '__iadd__ insert sort'.split(), + ) + ) def __add__(self, other): if not isinstance(other, tuple): @@ -663,7 +659,7 @@ def _read_dist_info_reqs(self): def _read_egg_info_reqs(self): source = self.read_text('requires.txt') - return source and self._deps_from_requires_text(source) + return pass_none(self._deps_from_requires_text)(source) @classmethod def _deps_from_requires_text(cls, source): diff --git a/setuptools/_vendor/vendored.txt b/setuptools/_vendor/vendored.txt index 1dd32ef27e..db24b402f5 100644 --- a/setuptools/_vendor/vendored.txt +++ b/setuptools/_vendor/vendored.txt @@ -4,7 +4,7 @@ ordered-set==3.1.1 more_itertools==8.8.0 jaraco.text==3.7.0 importlib_resources==5.4.0 -importlib_metadata==4.10.1 +importlib_metadata==4.11.1 # required for importlib_metadata on older Pythons typing_extensions==4.0.1 # required for importlib_resources and _metadata on older Pythons