mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 10:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add user-facing output to indicate PEP 723 script (#4881)

Browse source
This commit is contained in:
Charlie Marsh 2024-07-07 21:05:13 -05:00 • committed by GitHub
parent ae242c3b8f
commit ffcc05240e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/uv/src/commands/project/run.rs
View file

@ -1,9 +1,11 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::ffi::OsString; use std::ffi::OsString;
use std::fmt::Write;
use std::path::PathBuf; use std::path::PathBuf;
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use itertools::Itertools; use itertools::Itertools;
use owo_colors::OwoColorize;
use tokio::process::Command; use tokio::process::Command;
use tracing::debug; use tracing::debug;
@ -13,6 +15,7 @@ use uv_cli::ExternalCommand;
use uv_client::{BaseClientBuilder, Connectivity}; use uv_client::{BaseClientBuilder, Connectivity};
use uv_configuration::{Concurrency, ExtrasSpecification, PreviewMode}; use uv_configuration::{Concurrency, ExtrasSpecification, PreviewMode};
use uv_distribution::{VirtualProject, Workspace, WorkspaceError}; use uv_distribution::{VirtualProject, Workspace, WorkspaceError};
use uv_fs::Simplified;
use uv_installer::{SatisfiesResult, SitePackages}; use uv_installer::{SatisfiesResult, SitePackages};
use uv_normalize::PackageName; use uv_normalize::PackageName;
use uv_python::{ use uv_python::{
@ -63,7 +66,11 @@ pub(crate) async fn run(
// Determine whether the command to execute is a PEP 723 script. // Determine whether the command to execute is a PEP 723 script.
let script_interpreter = if let RunCommand::Python(target, _) = &command { let script_interpreter = if let RunCommand::Python(target, _) = &command {
if let Some(metadata) = uv_scripts::read_pep723_metadata(&target).await? { if let Some(metadata) = uv_scripts::read_pep723_metadata(&target).await? {
debug!("Found PEP 723 script at: {}", target.display()); writeln!(
printer.stderr(),
"Reading inline script metadata from: {}",
target.user_display().cyan()
)?;
// (1) Explicit request from user // (1) Explicit request from user
let python_request = if let Some(request) = python.as_deref() { let python_request = if let Some(request) = python.as_deref() {

20
crates/uv/tests/run.rs
View file

@ -225,16 +225,17 @@ fn run_script() -> Result<()> {
// Running the script should install the requirements. // Running the script should install the requirements.
uv_snapshot!(context.filters(), context.run().arg("--preview").arg("main.py"), @r###" uv_snapshot!(context.filters(), context.run().arg("--preview").arg("main.py"), @r###"
success: true success: true
exit_code: 0 exit_code: 0
----- stdout ----- ----- stdout -----
----- stderr ----- ----- stderr -----
Resolved 1 package in [TIME] Reading inline script metadata from: main.py
Prepared 1 package in [TIME] Resolved 1 package in [TIME]
Installed 1 package in [TIME] Prepared 1 package in [TIME]
+ iniconfig==2.0.0 Installed 1 package in [TIME]
"###); + iniconfig==2.0.0
"###);
// Running again should use the existing environment. // Running again should use the existing environment.
uv_snapshot!(context.filters(), context.run().arg("--preview").arg("main.py"), @r###" uv_snapshot!(context.filters(), context.run().arg("--preview").arg("main.py"), @r###"
@ -243,6 +244,7 @@ fn run_script() -> Result<()> {
----- stdout ----- ----- stdout -----
----- stderr ----- ----- stderr -----
Reading inline script metadata from: main.py
Resolved 1 package in [TIME] Resolved 1 package in [TIME]
"###); "###);