Skip to content

fix(py_wheel): Fix parsing errors with requires_file attribute. #1719

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

Merged
merged 1 commit into from
Jan 24, 2024
Merged

fix(py_wheel): Fix parsing errors with requires_file attribute. #1719

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
3 changes: 2 additions & 1 deletion examples/wheel/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ write_file(
--index-url https://pypi.com

tomli>=2.0.0
starlark # Example comment
""".splitlines(),
)

Expand All @@ -290,7 +291,7 @@ write_file(

pyyaml>=6.0.0,!=6.0.1
toml; (python_version == "3.11" or python_version == "3.12") and python_version != "3.8"
wheel; python_version == "3.11" or python_version == "3.12"
wheel; python_version == "3.11" or python_version == "3.12" # Example comment
""".splitlines(),
)

Expand Down
3 changes: 2 additions & 1 deletion examples/wheel/wheel_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,8 @@ def test_requires_file_and_extra_requires_files(self):
print(requires)
self.assertEqual(
[
"Requires-Dist: tomli>=2.0.0;",
"Requires-Dist: tomli>=2.0.0",
"Requires-Dist: starlark",
"Requires-Dist: pyyaml!=6.0.1,>=6.0.0; extra == 'example'",
'Requires-Dist: toml; ((python_version == "3.11" or python_version == "3.12") and python_version != "3.8") and extra == \'example\'',
'Requires-Dist: wheel; (python_version == "3.11" or python_version == "3.12") and extra == \'example\'',
Expand Down
18 changes: 14 additions & 4 deletions tools/wheelmaker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,13 +531,23 @@ def main() -> None:
if not reqs_text or reqs_text.startswith(("#", "-")):
continue

req = Requirement(reqs_text)
# Strip any comments
reqs_text, _, _ = reqs_text.partition("#")

req = Requirement(reqs_text.strip())
if req.marker:
if extra:
reqs.append(
f"Requires-Dist: {req.name}{req.specifier}; ({req.marker}) and {extra}"
)
else:
reqs.append(
f"Requires-Dist: {req.name}{req.specifier}; {req.marker}"
)
else:
reqs.append(
f"Requires-Dist: {req.name}{req.specifier}; ({req.marker}) and {extra}"
f"Requires-Dist: {req.name}{req.specifier}; {extra}".strip(" ;")
)
else:
reqs.append(f"Requires-Dist: {req.name}{req.specifier}; {extra}")

metadata = metadata.replace(meta_line, "\n".join(reqs))

Expand Down