-
Notifications
You must be signed in to change notification settings - Fork 732
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.
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
Support PEP 723 metadata with uv run -
#8111
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -107,11 +107,19 @@ pub(crate) async fn run( | |
// Determine whether the command to execute is a PEP 723 script. | ||
let temp_dir; | ||
let script_interpreter = if let Some(script) = script { | ||
writeln!( | ||
printer.stderr(), | ||
"Reading inline script metadata from: {}", | ||
script.path.user_display().cyan() | ||
)?; | ||
if let uv_scripts::Source::File(path) = &script.source { | ||
writeln!( | ||
printer.stderr(), | ||
"Reading inline script metadata from: {}", | ||
path.user_display().cyan() | ||
)?; | ||
} else { | ||
writeln!( | ||
printer.stderr(), | ||
"Reading inline script metadata from: {}", | ||
"<stdin>".cyan() | ||
)?; | ||
} | ||
|
||
let (source, python_request) = if let Some(request) = python.as_deref() { | ||
// (1) Explicit request from user | ||
|
@@ -196,15 +204,23 @@ pub(crate) async fn run( | |
.unwrap_or(&empty), | ||
SourceStrategy::Disabled => &empty, | ||
}; | ||
let script_path = std::path::absolute(script.path)?; | ||
let script_dir = script_path.parent().expect("script path has no parent"); | ||
let script_dir = match &script.source { | ||
uv_scripts::Source::File(path) => { | ||
let script_path = std::path::absolute(path)?; | ||
script_path | ||
.parent() | ||
.expect("script path has no parent") | ||
.to_owned() | ||
} | ||
uv_scripts::Source::Stdin => std::env::current_dir()?, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think the current dir makes sense here. |
||
}; | ||
|
||
let requirements = dependencies | ||
.into_iter() | ||
.flat_map(|requirement| { | ||
LoweredRequirement::from_non_workspace_requirement( | ||
requirement, | ||
script_dir, | ||
script_dir.as_ref(), | ||
script_sources, | ||
) | ||
.map_ok(LoweredRequirement::into_inner) | ||
|
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tried to move the
match
within writelin! but couldn't get the arm types to match.