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

Fix python_version metadata extraction for bdist_egg distributions #1192

Closed
wants to merge 1 commit into from
Closed

Fix python_version metadata extraction for bdist_egg distributions #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/1192.bug.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Fix python_version metadata extraction for bdist_egg distributions.
3 changes: 2 additions & 1 deletion tests/test_package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,4 +465,5 @@ def test_malformed_from_file(monkeypatch):

def test_package_from_egg():
filename = "tests/fixtures/twine-3.3.0-py3.9.egg"
package_file.PackageFile.from_filename(filename, comment=None)
p = package_file.PackageFile.from_filename(filename, comment=None)
assert p.python_version == "3.9"
20 changes: 18 additions & 2 deletions twine/package.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,21 @@
".zip": "sdist",
}

# Match the regualr expression used by ``pkg_resources``, extended to
# include the file extension and the end-of-string anchor.
egg_filename_re = re.compile(
r"""
(?P<name>[^-]+) (
-(?P<ver>[^-]+) (
-py(?P<pyver>[^-]+) (
-(?P<plat>.+)
)?
)?
)?\.egg$
""",
re.VERBOSE | re.IGNORECASE,
)

MetadataValue = Union[Optional[str], Sequence[str], Tuple[str, bytes]]

logger = logging.getLogger(__name__)
Expand Down Expand Up @@ -159,8 +174,9 @@ def from_filename(cls, filename: str, comment: Optional[str]) -> "PackageFile":

py_version: Optional[str]
if dtype == "bdist_egg":
(dist,) = importlib_metadata.Distribution.discover(path=[filename])
py_version = dist.metadata["Version"]
m = egg_filename_re.match(os.path.basename(filename))
assert m is not None, "for mypy"
py_version = m.group("pyver")
elif dtype == "bdist_wheel":
py_version = cast(wheel.Wheel, meta).py_version
elif dtype == "bdist_wininst":
Expand Down