Skip to content

Commit 4f78331

Browse files
authored
Merge pull request #3109 from pypa/bugfix/3107-importlib-metadata-empty-egginfo-requires
Bump importlib_metadata to 4.11.1
2 parents c03287a + e688cb5 commit 4f78331

File tree

10 files changed

+25
-28
lines changed

10 files changed

+25
-28
lines changed

changelog.d/3107.misc.rst

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump importlib_metadata to 4.11.1 addressing issue with parsing requirements in egg-info as found in PyPy.

setuptools/_vendor/importlib_metadata-4.10.1.dist-info/METADATA setuptools/_vendor/importlib_metadata-4.11.1.dist-info/METADATA

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: importlib-metadata
3-
Version: 4.10.1
3+
Version: 4.11.1
44
Summary: Read metadata from Python packages
55
Home-page: https://github.com/python/importlib_metadata
66
Author: Jason R. Coombs
@@ -33,7 +33,7 @@ Requires-Dist: pyfakefs ; extra == 'testing'
3333
Requires-Dist: flufl.flake8 ; extra == 'testing'
3434
Requires-Dist: pytest-perf (>=0.9.2) ; extra == 'testing'
3535
Requires-Dist: pytest-black (>=0.3.7) ; (platform_python_implementation != "PyPy") and extra == 'testing'
36-
Requires-Dist: pytest-mypy ; (platform_python_implementation != "PyPy") and extra == 'testing'
36+
Requires-Dist: pytest-mypy (>=0.9.1) ; (platform_python_implementation != "PyPy") and extra == 'testing'
3737
Requires-Dist: importlib-resources (>=1.3) ; (python_version < "3.9") and extra == 'testing'
3838

3939
.. 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
5555
.. image:: https://readthedocs.org/projects/importlib-metadata/badge/?version=latest
5656
:target: https://importlib-metadata.readthedocs.io/en/latest/?badge=latest
5757

58-
.. image:: https://img.shields.io/badge/skeleton-2021-informational
58+
.. image:: https://img.shields.io/badge/skeleton-2022-informational
5959
:target: https://blog.jaraco.com/skeleton
6060

6161

setuptools/_vendor/importlib_metadata-4.10.1.dist-info/RECORD setuptools/_vendor/importlib_metadata-4.11.1.dist-info/RECORD

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
importlib_metadata-4.10.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
2-
importlib_metadata-4.10.1.dist-info/LICENSE,sha256=wNe6dAchmJ1VvVB8D9oTc-gHHadCuaSBAev36sYEM6U,571
3-
importlib_metadata-4.10.1.dist-info/METADATA,sha256=-HDYj3iK6bcjwN5MAoO58Op6WQIYQfbhl6ZaPqL0IZI,3989
4-
importlib_metadata-4.10.1.dist-info/RECORD,,
5-
importlib_metadata-4.10.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6-
importlib_metadata-4.10.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
7-
importlib_metadata-4.10.1.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
8-
importlib_metadata/__init__.py,sha256=7WxDdbPPu4Wy3VeMTApd-JlPQoENgVDyDH6aqyE7acE,30175
1+
importlib_metadata-4.11.1.dist-info/INSTALLER,sha256=zuuue4knoyJ-UwPPXg8fezS7VCrXJQrAP7zeNuwvFQg,4
2+
importlib_metadata-4.11.1.dist-info/LICENSE,sha256=wNe6dAchmJ1VvVB8D9oTc-gHHadCuaSBAev36sYEM6U,571
3+
importlib_metadata-4.11.1.dist-info/METADATA,sha256=XNgM09x6V8tbt6ugvKjiUxH9yB7pBdILWuWE5YNWHRw,3999
4+
importlib_metadata-4.11.1.dist-info/RECORD,,
5+
importlib_metadata-4.11.1.dist-info/REQUESTED,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6+
importlib_metadata-4.11.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
7+
importlib_metadata-4.11.1.dist-info/top_level.txt,sha256=CO3fD9yylANiXkrMo4qHLV_mqXL2sC5JFKgt1yWAT-A,19
8+
importlib_metadata/__init__.py,sha256=Wkh_tb0u0Ds_615ByV9VLLjqgoOWirwMY8EW40oO3nM,30122
99
importlib_metadata/__pycache__/__init__.cpython-310.pyc,,
1010
importlib_metadata/__pycache__/_adapters.cpython-310.pyc,,
1111
importlib_metadata/__pycache__/_collections.cpython-310.pyc,,

setuptools/_vendor/importlib_metadata/__init__.py

+12-16
Original file line numberDiff line numberDiff line change
@@ -283,6 +283,8 @@ class DeprecatedList(list):
283283
1
284284
"""
285285

286+
__slots__ = ()
287+
286288
_warn = functools.partial(
287289
warnings.warn,
288290
"EntryPoints list interface is deprecated. Cast to list if needed.",
@@ -295,21 +297,15 @@ def wrapped(self, *args, **kwargs):
295297
self._warn()
296298
return getattr(super(), method_name)(*args, **kwargs)
297299

298-
return wrapped
299-
300-
for method_name in [
301-
'__setitem__',
302-
'__delitem__',
303-
'append',
304-
'reverse',
305-
'extend',
306-
'pop',
307-
'remove',
308-
'__iadd__',
309-
'insert',
310-
'sort',
311-
]:
312-
locals()[method_name] = _wrap_deprecated_method(method_name)
300+
return method_name, wrapped
301+
302+
locals().update(
303+
map(
304+
_wrap_deprecated_method,
305+
'__setitem__ __delitem__ append reverse extend pop remove '
306+
'__iadd__ insert sort'.split(),
307+
)
308+
)
313309

314310
def __add__(self, other):
315311
if not isinstance(other, tuple):
@@ -663,7 +659,7 @@ def _read_dist_info_reqs(self):
663659

664660
def _read_egg_info_reqs(self):
665661
source = self.read_text('requires.txt')
666-
return source and self._deps_from_requires_text(source)
662+
return pass_none(self._deps_from_requires_text)(source)
667663

668664
@classmethod
669665
def _deps_from_requires_text(cls, source):

setuptools/_vendor/vendored.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ordered-set==3.1.1
44
more_itertools==8.8.0
55
jaraco.text==3.7.0
66
importlib_resources==5.4.0
7-
importlib_metadata==4.10.1
7+
importlib_metadata==4.11.1
88
# required for importlib_metadata on older Pythons
99
typing_extensions==4.0.1
1010
# required for importlib_resources and _metadata on older Pythons

0 commit comments

Comments
 (0)