Skip to content

Commit 2aae83b

Browse files
committed
Remove reliance on pkg_resources in test_wheel.
1 parent 0efe364 commit 2aae83b

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

setuptools/tests/test_wheel.py

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from jaraco import path
1919
from packaging.tags import parse_tag
2020

21-
from pkg_resources import Distribution, PathMetadata
21+
from setuptools._importlib import metadata
2222
from setuptools.wheel import Wheel
2323

2424
from .contexts import tempdir
@@ -158,15 +158,11 @@ def _check_wheel_install(
158158
exp = tree_set(install_dir)
159159
assert install_tree.issubset(exp), install_tree - exp
160160

161-
metadata = PathMetadata(egg_path, os.path.join(egg_path, 'EGG-INFO'))
162-
dist = Distribution.from_filename(egg_path, metadata=metadata)
163-
assert dist.project_name == project_name
164-
assert dist.version == version
165-
if requires_txt is None:
166-
assert not dist.has_metadata('requires.txt')
167-
else:
168-
# Order must match to ensure reproducibility.
169-
assert requires_txt == dist.get_metadata('requires.txt').lstrip()
161+
(dist,) = metadata.Distribution.discover(path=[egg_path])
162+
163+
assert dist.metadata['Name'] == project_name
164+
assert dist.metadata['Version'] == version
165+
assert dist.read_text('requires.txt') == requires_txt
170166

171167

172168
class Record:
@@ -405,7 +401,8 @@ def __repr__(self) -> str:
405401
extras_require={
406402
'extra': f'foobar; {sys.platform!r} != sys_platform',
407403
},
408-
requires_txt=DALS(
404+
requires_txt='\n'
405+
+ DALS(
409406
"""
410407
[extra]
411408
"""

0 commit comments

Comments
 (0)