-
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 uv run --script
#7739
Merged
Merged
Support uv run --script
#7739
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
tfsingh
commented
Sep 27, 2024
I think I'd explore something like this instead? diff --git a/crates/uv/src/commands/project/run.rs b/crates/uv/src/commands/project/run.rs
index 2dc660e34..a375d126e 100644
--- a/crates/uv/src/commands/project/run.rs
+++ b/crates/uv/src/commands/project/run.rs
@@ -862,6 +862,17 @@ impl RunCommand {
}
}
+ pub(crate) fn force_python_script(self) -> anyhow::Result<Self> {
+ match self {
+ Self::Empty => Ok(self),
+ Self::PythonScript(..) | Self::PythonGuiScript(..) => Ok(self),
+ Self::PythonPackage(..) => {
+ bail!("Target is a directory and cannot be executed as a script")
+ }
+ _ => todo!(),
+ }
+ }
+
/// Convert a [`RunCommand`] into a [`Command`].
fn as_command(&self, interpreter: &Interpreter) -> Command {
match self {
diff --git a/crates/uv/src/lib.rs b/crates/uv/src/lib.rs
index 68efb85b1..b0de789fc 100644
--- a/crates/uv/src/lib.rs
+++ b/crates/uv/src/lib.rs
@@ -135,17 +135,12 @@ async fn run(cli: Cli) -> Result<ExitStatus> {
command, script, ..
}) = &**command
{
- if *script {
- let (target, args) = command.split();
- if let Some(target) = target {
- let path = PathBuf::from(&target);
- Some(RunCommand::PythonScript(path, args.to_vec()))
- } else {
- anyhow::bail!("Script path must be supplied when using `uv run --script`");
- }
+ let command = RunCommand::try_from(command)?;
+ Some(if *script {
+ command.force_python_script()?
} else {
- Some(RunCommand::try_from(command)?)
- }
+ command
+ })
} else {
None
} |
Looks like |
zanieb
reviewed
Oct 1, 2024
zanieb
approved these changes
Oct 2, 2024
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.
Thanks!
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Oct 11, 2024
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [astral-sh/uv](https://github.com/astral-sh/uv) | patch | `0.4.18` -> `0.4.20` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>astral-sh/uv (astral-sh/uv)</summary> ### [`v0.4.20`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0420) [Compare Source](astral-sh/uv@0.4.19...0.4.20) ##### Enhancements - Add managed downloads for CPython 3.13.0 (final) ([#​8010](astral-sh/uv#8010)) - Python 3.13 is the default version for `uv python install` ([#​8010](astral-sh/uv#8010)) - Hint at wrong endpoint in `uv publish` failures ([#​7872](astral-sh/uv#7872)) - List available scripts when a command is not specified for `uv run` ([#​7687](astral-sh/uv#7687)) - Fill in `authors` field during `uv init` ([#​7756](astral-sh/uv#7756)) ##### Documentation - Add snapshot testing to contribution guide ([#​7882](astral-sh/uv#7882)) - Fix and improve GitLab integration docs ([#​8000](astral-sh/uv#8000)) ### [`v0.4.19`](https://github.com/astral-sh/uv/blob/HEAD/CHANGELOG.md#0419) [Compare Source](astral-sh/uv@0.4.18...0.4.19) ##### Enhancements - Add managed downloads for CPython 3.13.0rc3 and 3.12.7 ([#​7880](astral-sh/uv#7880)) - Display the target virtual environment path if non-default ([#​7850](astral-sh/uv#7850)) - Preserve case-insensitive sorts in `uv add` ([#​7864](astral-sh/uv#7864)) - Respect project upper bounds when filtering wheels on `requires-python` ([#​7904](astral-sh/uv#7904)) - Add `--script` to `uv run` to treat an input as PEP 723 regardless of extension ([#​7739](astral-sh/uv#7739)) - Improve legibility of build failure errors ([#​7854](astral-sh/uv#7854)) - Show interpreter source during Python discovery query errors ([#​7928](astral-sh/uv#7928)) ##### Configuration - Add `UV_FIND_LINKS` environment variable for `--find-links` ([#​7912](astral-sh/uv#7912)) - Ignore empty string values for `UV_PYTHON` environment variable ([#​7878](astral-sh/uv#7878)) ##### Bug fixes - Allow `py3x-none` tags in newer than Python 3.x ([#​7867](astral-sh/uv#7867)) - Allow self-dependencies in the `dev` section ([#​7943](astral-sh/uv#7943)) - Always ignore `cp2` wheels in resolution ([#​7902](astral-sh/uv#7902)) - Clear the publish progress bar on retry ([#​7921](astral-sh/uv#7921)) - Fix parsing of `gnueabi` libc variants in Python version requests ([#​7975](astral-sh/uv#7975)) - Simplify supported environments when comparing to lockfile ([#​7894](astral-sh/uv#7894)) - Trim commits when reading from Git refs ([#​7922](astral-sh/uv#7922)) - Use a higher HTTP read timeout when publishing packages ([#​7923](astral-sh/uv#7923)) - Remove the first empty line for `uv tree --package foo` ([#​7885](astral-sh/uv#7885)) ##### Documentation - Add 3.13 support to the platform reference ([#​7971](astral-sh/uv#7971)) - Clarify project environment creation ([#​7941](astral-sh/uv#7941)) - Fix code block title in Gitlab integration docs ([#​7861](astral-sh/uv#7861)) - Fix project guide section on adding a Git dependency ([#​7916](astral-sh/uv#7916)) - Fix uninstallation command for Windows ([#​7944](astral-sh/uv#7944)) - Clearly specify the minimum supported Windows Server version ([#​7946](astral-sh/uv#7946)) ##### Rust API - Remove unused `Sha256Reader` ([#​7929](astral-sh/uv#7929)) - Remove unnecessary `Deserialize` derives on settings ([#​7856](astral-sh/uv#7856)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
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.
This PR adds support for executing a script with
uv run
, even when the script does not have a.py
extension. Addresses #7396.