pioduino/uv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Extend activation highlighting to entire command (#2070)

Browse Source 
## Summary

In `source .venv/bin/activate`, _only_ `.venv` is colored cyan.

![Screenshot 2024-02-28 at 8 17
32 PM](https://github.com/astral-sh/uv/assets/1309177/2acc16f9-4de2-4cd9-9216-8348cf896d36)
This commit is contained in:
Charlie Marsh
2024-02-28 20:27:35 -05:00
committed by GitHub
parent 1bc5485094
commit f315d07133
3 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/uv-interpreter/src/python_query.rs
+1 -1
View File
@@ -29,7 +29,7 @@ pub fn find_requested_python(
platform: &Platform,
cache: &Cache,
) -> Result<Option<Interpreter>, Error> {
debug!("Starting interpreter discovery for Python {}", request);
debug!("Starting interpreter discovery for Python @ `{request}`");
let versions = request
.splitn(3, '.')
.map(str::parse::<u8>)
crates/uv/src/commands/venv.rs
+12 -5
View File
@@ -106,7 +106,7 @@ async fn venv_impl(
writeln!(
printer,
"Using Python {} interpreter at {}",
"Using Python {} interpreter at: {}",
interpreter.python_version(),
interpreter.sys_executable().normalized_display().cyan()
)
@@ -211,15 +211,22 @@ async fn venv_impl(
writeln!(
printer,
// This should work whether the user is on CMD or PowerShell:
"Activate with: {}\\Scripts\\activate",
path.normalized_display().cyan()
"Activate with: {}",
path.join("Scripts")
.join("activate")
.normalized_display()
.green()
)
.into_diagnostic()?;
} else {
writeln!(
printer,
"Activate with: source {}/bin/activate",
path.normalized_display().cyan()
"Activate with: {}",
format!(
"source {}",
path.join("bin").join("activate").normalized_display()
)
.green()
)
.into_diagnostic()?;
};
crates/uv/tests/venv.rs
+34 -34
View File
@@ -25,8 +25,8 @@ fn create_venv() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -50,7 +50,7 @@ fn create_venv() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
Activate with: source /home/ferris/project/.venv/bin/activate
"###
@@ -63,8 +63,8 @@ fn create_venv() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -89,7 +89,7 @@ fn create_venv() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
Activate with: source /home/ferris/project/.venv/bin/activate
"###
@@ -111,8 +111,8 @@ fn create_venv_defaults_to_cwd() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(filter_prompt, "Activate with: source .venv/bin/activate"),
@@ -133,7 +133,7 @@ fn create_venv_defaults_to_cwd() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: .venv
Activate with: source .venv/bin/activate
"###
@@ -155,8 +155,8 @@ fn seed() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -182,7 +182,7 @@ fn seed() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
+ pip==23.3.1
Activate with: source /home/ferris/project/.venv/bin/activate
@@ -205,8 +205,8 @@ fn seed_older_python_version() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -232,7 +232,7 @@ fn seed_older_python_version() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
+ pip==23.3.1
+ setuptools==68.2.2
@@ -303,8 +303,8 @@ fn create_venv_unknown_python_patch() -> Result<()> {
let filter_venv = regex::escape(&venv.normalized_display().to_string());
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(
r"No Python 3\.8\.0 found through `py --list-paths` or in `PATH`\. Is Python 3\.8\.0 installed\?",
@@ -349,7 +349,7 @@ fn create_venv_python_patch() -> Result<()> {
let filter_venv = regex::escape(&venv.normalized_display().to_string());
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(r"interpreter at .+", "interpreter at [PATH]"),
(r"interpreter at: .+", "interpreter at: [PATH]"),
(&filter_venv, "/home/ferris/project/.venv"),
(
filter_prompt,
@@ -373,7 +373,7 @@ fn create_venv_python_patch() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python 3.12.1 interpreter at [PATH]
Using Python 3.12.1 interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
Activate with: source /home/ferris/project/.venv/bin/activate
"###
@@ -397,8 +397,8 @@ fn file_exists() -> Result<()> {
let filter_venv = regex::escape(&venv.normalized_display().to_string());
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
];
@@ -419,7 +419,7 @@ fn file_exists() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
uv::venv::creation
@@ -445,8 +445,8 @@ fn empty_dir_exists() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -471,7 +471,7 @@ fn empty_dir_exists() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
Activate with: source /home/ferris/project/.venv/bin/activate
"###
@@ -496,8 +496,8 @@ fn non_empty_dir_exists() -> Result<()> {
let filter_venv = regex::escape(&venv.normalized_display().to_string());
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
];
@@ -518,7 +518,7 @@ fn non_empty_dir_exists() -> Result<()> {
----- stdout -----
----- stderr -----
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
uv::venv::creation
@@ -561,8 +561,8 @@ fn windows_shims() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.8.\d+ interpreter at .+",
"Using Python 3.8.x interpreter at [PATH]",
r"Using Python 3\.8.\d+ interpreter at: .+",
"Using Python 3.8.x interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -586,7 +586,7 @@ fn windows_shims() -> Result<()> {
----- stderr -----
warning: virtualenv's `--clear` has no effect (uv always clears the virtual environment).
Using Python 3.8.x interpreter at [PATH]
Using Python 3.8.x interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
Activate with: source /home/ferris/project/.venv/bin/activate
"###
@@ -609,8 +609,8 @@ fn virtualenv_compatibility() -> Result<()> {
let filter_prompt = r"Activate with: (?:.*)\\Scripts\\activate";
let filters = &[
(
r"Using Python 3\.\d+\.\d+ interpreter at .+",
"Using Python [VERSION] interpreter at [PATH]",
r"Using Python 3\.\d+\.\d+ interpreter at: .+",
"Using Python [VERSION] interpreter at: [PATH]",
),
(&filter_venv, "/home/ferris/project/.venv"),
(
@@ -636,7 +636,7 @@ fn virtualenv_compatibility() -> Result<()> {
----- stderr -----
warning: virtualenv's `--clear` has no effect (uv always clears the virtual environment).
Using Python [VERSION] interpreter at [PATH]
Using Python [VERSION] interpreter at: [PATH]
Creating virtualenv at: /home/ferris/project/.venv
Activate with: source /home/ferris/project/.venv/bin/activate
"###