Support locks path deps with path deps #6438
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pass the location of `uv.lock`, the base of our relative lockfile pass, through when locking in project mode. This fixes previous incorrect paths that were using the root of the other workspace as reference for the relative path. Fix #6371.
konstin
force-pushed
the
konsti/support-relative-path-hopping
branch
from
2867f8c
to
ccfdae1
Compare
| @@ -336,6 +336,8 @@ pub(crate) async fn pip_install( | |||
| dev, | |||
| source_trees, | |||
| project, | |||
| // Not needed, there's no `uv.lock`. | |||
| None, | |||
There was a problem hiding this comment.
Should we make this a custom enum so you don't need this comment everywhere? Something self-documenting, like WorkspaceRoot::None?
There was a problem hiding this comment.
Otherwise I'd probably just remove the comments.
| @@ -310,6 +310,10 @@ pub(crate) async fn pip_compile( | |||
| BuildIsolation::SharedPackage(&environment, &no_build_isolation_package) | |||
| }; | |||
|
|
|||
| // Currently no effect (only used for `uv.lock`), but there's no reason not to preserve this | |||
| // information. | |||
| let main_workspace_root = output_file.and_then(|file| file.parent()); | |||
There was a problem hiding this comment.
Should we just use None then?
charliermarsh
approved these changes
Aug 22, 2024
|
Those Windows failures are real -- we need to consistently use the canonical or non-canonical paths. |
|
Waiting for #6490 first |
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 23, 2024
charliermarsh
pushed a commit
that referenced
this pull request
Aug 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pass the location of
uv.lock, the base of our relative lockfile paths, around when locking in project mode. This fixes previous incorrect paths that were using the root of the other workspace as reference for the relative path.Fixes #6371.