Fixup relative and absolute path handling #1329
Commits on Jun 16, 2022
-
Add optional param from_dir to format_requirement
If passed, it will attempt to relative-ize the resulting URL (if possible). Add helper: fragment_string
-
-
Add abs_ireq for normalizing ireqs, and related tests
- abs_ireq_preserves_source_ireqs - format_requirement_impossible_relative_path_becomes_absolute (Windows-only)
-
Update test to expect and accept more Windows file URIs
Specifically ones which start like file:///C:/
-
Add writer test for annotation accuracy regarding source ireqs
Ensure source ireqs' comes_from attr is credited in annotations
-
Add optional param from_dir to _comes_from_as_string
This brings with it more involved string manipulation
-
Add optional from_dir param to parse_requirements
If passed, from_dir will be used instead of CWD to interpret relative paths. Special care is taken to guarantee _was_relative in the yielded ireqs, if originally relative. When calling format_requirement, _was_relative's presence now determines what's passed as from_dir: either CWD or None (None leads to an absolute path output)
-
Add flag for compile: --write-relative-to-output
With test, and needed changes: - Use this flag to decide what to pass as from_dir to parse_requirements - Add init param to OutputWriter: write_relative_to_output - Add corresponding from_dir logic and use to OutputWriter._format_requirement - Add test_write_relative_to_output which runs with the new flag both on and off
-
Add test_local_editable_vcs_package
This ensures absolute intact paths for git+file: reqs
-
Add flag to sync: --read-relative-to-input
With test_sync_relative_path If the reqs in the output were written relative to that output file (pip-compile --write-relative-to-output), then it's wise for pip-sync to interpret reqs it finds in there from the location of the output file. This is now possible with pip-sync --read-relative-to-input. To be clear: pip-sync's "input" is pip-compile's "output."
-
Absolute-ize src_file paths and more safely determine output file paths
This fixes at least two problems, for which tests are added.
-
Add flag for compile: --read-relative-to-input
And add tests via parameterization
-
-
-
-
Replicate pip's install_req_from_link_and_ireq in utils
For compatibility with pip<21.1
-
Avoid choking on a relative path without scheme prefix, with fragment
e.g. ../../rawr#egg=rawr-cli
-
Improve our version of install_req_from_link_and_ireq (diverge)
... to properly set .extras
-
Improve consistency of output regarding fragments and extras
This fixes false-positive _was_relative assignments for some direct references like: ptrender[yaml] @ file:///home/andy/Code/ptrender
-
-
Remove fragment_string parameter omit_extras
As we always want to set that True
-
-
-
Further diverge from pip's install_req_from_link_and_ireq
Preserve ireq.constraint and _source_ireqs
-
More thorough install_req_from_link_and_ireq
At this code point we currently expect the original ireq.extras to be an empty set every time, so this does not change any current behavior. But if in the future ireqs with already parsed extras are passed, it should now preserve those.
-
-
-
Construct relative req lines to match what pip install understands
Based on findings at jazzband#1329 (comment)
