Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix .egg-info metadata support for zipimport #2490

Merged
merged 3 commits into from Jan 16, 2021
Merged

Fix .egg-info metadata support for zipimport #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
44d45ae
Failing test for #2489
thatch Dec 14, 2020
c3019cf
Find .egg-info in zipimport too
thatch Dec 14, 2020
b31105b
Rely on tuple argument to endswith
jaraco Jan 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelog.d/2489.change.rst
View file
Open in desktop
@@ -0,0 +1,2 @@
``pkg_resources`` behavior for zipimport now matches the regular behavior, and finds
``.egg-info`` (previoulsy would only find ``.dist-info``) -- by :user:`thatch`
3 changes: 2 additions & 1 deletion pkg_resources/__init__.py
View file
Open in desktop
Expand Up @@ -1978,12 +1978,13 @@ def find_eggs_in_zip(importer, path_item, only=False):
# don't yield nested distros
return
for subitem in metadata.resource_listdir(''):
lower = subitem.lower()
jaraco marked this conversation as resolved.
Show resolved Hide resolved
if _is_egg_path(subitem):
subpath = os.path.join(path_item, subitem)
dists = find_eggs_in_zip(zipimport.zipimporter(subpath), subpath)
for dist in dists:
yield dist
elif subitem.lower().endswith('.dist-info'):
elif subitem.lower().endswith(('.dist-info', '.egg-info')):
subpath = os.path.join(path_item, subitem)
submeta = EggMetadata(zipimport.zipimporter(subpath))
submeta.egg_info = subpath
Expand Down
Binary file added pkg_resources/tests/data/my-test-package-zip/my-test-package.zip
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions pkg_resources/tests/test_find_distributions.py
View file
Open in desktop
Expand Up @@ -32,3 +32,12 @@ def test_zipped_egg(self, target_dir):
assert [dist.project_name for dist in dists] == ['my-test-package']
dists = pkg_resources.find_distributions(str(target_dir), only=True)
assert not list(dists)

def test_zipped_sdist_one_level_removed(self, target_dir):
(TESTS_DATA_DIR / 'my-test-package-zip').copy(target_dir)
dists = pkg_resources.find_distributions(
str(target_dir / "my-test-package.zip"))
assert [dist.project_name for dist in dists] == ['my-test-package']
dists = pkg_resources.find_distributions(
str(target_dir / "my-test-package.zip"), only=True)
assert not list(dists)