Skip to content

Fix for requirements_lock with PEP440 direct references #756

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 2 commits into from
Jul 14, 2022
Merged

Fix for requirements_lock with PEP440 direct references #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
007709b
.
groodt Jul 14, 2022
7e179a7
Merge branch 'main' into groodt-fix-direct-url-refs
groodt Jul 14, 2022
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
7 changes: 6 additions & 1 deletion python/pip_install/extract_wheels/parse_requirements_to_bzl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ def parse_install_requirements(
):
if parsed_line.is_requirement:
install_req = constructors.install_req_from_line(parsed_line.requirement)
if not install_req.is_pinned:
if (
# PEP-440 direct references are considered pinned
# See: https://peps.python.org/pep-0440/#direct-references and https://peps.python.org/pep-0508/
not install_req.link and
not install_req.is_pinned
):
unpinned_reqs.append(str(install_req))
install_req_and_lines.append(
(install_req, line)
Expand Down
27 changes: 27 additions & 0 deletions python/pip_install/extract_wheels/parse_requirements_to_bzl_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,33 @@ def test_parse_install_requirements_with_args(self):
),
)

def test_parse_install_requirements_pinned_direct_reference(self):
# Test PEP-440 direct references
with tempfile.TemporaryDirectory() as temp_dir:
requirements_lock = Path(temp_dir) / "requirements.txt"
requirements_lock.write_text(
dedent(
"""\
onnx @ https://files.pythonhosted.org/packages/24/93/f5b001dc0f5de84ce049a34ff382032cd9478e1080aa6ac48470fa810577/onnx-1.11.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl \
--hash=sha256:67c6d2654c1c203e5c839a47900b51f588fd0de71bbd497fb193d30a0b3ec1e9
"""
)
)

install_req_and_lines = parse_install_requirements(
str(requirements_lock), ["-v"]
)

self.assertEqual(len(install_req_and_lines), 1)
self.assertEqual(install_req_and_lines[0][0].name, "onnx")

self.assertTupleEqual(
install_req_and_lines[0][1:],
(
"onnx @ https://files.pythonhosted.org/packages/24/93/f5b001dc0f5de84ce049a34ff382032cd9478e1080aa6ac48470fa810577/onnx-1.11.0-cp39-cp39-manylinux_2_12_x86_64.manylinux2010_x86_64.whl --hash=sha256:67c6d2654c1c203e5c839a47900b51f588fd0de71bbd497fb193d30a0b3ec1e9",
),
)


if __name__ == "__main__":
unittest.main()