Skip to content

Display Python implementation when creating environments #7652

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.

Sign up for GitHub

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

Merged
zanieb merged 1 commit into from
Sep 24, 2024
Merged

Display Python implementation when creating environments #7652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions crates/uv/src/commands/project/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,18 +449,21 @@ impl FoundInterpreter {
.await?;

let managed = python.source().is_managed();
let implementation = python.implementation();
let interpreter = python.into_interpreter();

if managed {
writeln!(
printer.stderr(),
"Using Python {}",
"Using {} {}",
implementation.pretty(),
interpreter.python_version().cyan()
)?;
} else {
writeln!(
printer.stderr(),
"Using Python {} interpreter at: {}",
"Using {} {} interpreter at: {}",
implementation.pretty(),
interpreter.python_version(),
interpreter.sys_executable().user_display().cyan()
)?;
Expand Down
7 changes: 5 additions & 2 deletions crates/uv/src/commands/venv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ async fn venv_impl(
.into_diagnostic()?;

let managed = python.source().is_managed();
let implementation = python.implementation();
let interpreter = python.into_interpreter();

// Add all authenticated sources to the cache.
Expand All @@ -232,14 +233,16 @@ async fn venv_impl(
if managed {
writeln!(
printer.stderr(),
"Using Python {}",
"Using {} {}",
implementation.pretty(),
interpreter.python_version().cyan()
)
.into_diagnostic()?;
} else {
writeln!(
printer.stderr(),
"Using Python {} interpreter at: {}",
"Using {} {} interpreter at: {}",
implementation.pretty(),
interpreter.python_version(),
interpreter.sys_executable().user_display().cyan()
)
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2039,7 +2039,7 @@ fn add_path() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Resolved 2 packages in [TIME]
Prepared 2 packages in [TIME]
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ fn relative_path() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 3 packages in [TIME]
"###);

Expand Down
14 changes: 7 additions & 7 deletions crates/uv/tests/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fn init() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 1 package in [TIME]
"###);

Expand Down Expand Up @@ -127,7 +127,7 @@ fn init_application() -> Result<()> {

----- stderr -----
warning: `VIRTUAL_ENV=[VENV]/` does not match the project environment path `.venv` and will be ignored
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Resolved 1 package in [TIME]
Audited in [TIME]
Expand Down Expand Up @@ -308,7 +308,7 @@ fn init_application_package() -> Result<()> {

----- stderr -----
warning: `VIRTUAL_ENV=[VENV]/` does not match the project environment path `.venv` and will be ignored
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Resolved 1 package in [TIME]
Prepared 1 package in [TIME]
Expand Down Expand Up @@ -390,7 +390,7 @@ fn init_library() -> Result<()> {

----- stderr -----
warning: `VIRTUAL_ENV=[VENV]/` does not match the project environment path `.venv` and will be ignored
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Resolved 1 package in [TIME]
Prepared 1 package in [TIME]
Expand Down Expand Up @@ -604,7 +604,7 @@ fn init_library_current_dir() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 1 package in [TIME]
"###);

Expand Down Expand Up @@ -668,7 +668,7 @@ fn init_application_current_dir() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 1 package in [TIME]
"###);

Expand Down Expand Up @@ -733,7 +733,7 @@ fn init_dot_args() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 1 package in [TIME]
"###);

Expand Down
42 changes: 21 additions & 21 deletions crates/uv/tests/lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3473,7 +3473,7 @@ fn lock_requires_python_wheels() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -3535,7 +3535,7 @@ fn lock_requires_python_wheels() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand All @@ -3560,7 +3560,7 @@ fn lock_requires_python_wheels() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.11.[X] interpreter at: [PYTHON-3.11]
Using CPython 3.11.[X] interpreter at: [PYTHON-3.11]
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -3637,7 +3637,7 @@ fn lock_requires_python_wheels() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.11.[X] interpreter at: [PYTHON-3.11]
Using CPython 3.11.[X] interpreter at: [PYTHON-3.11]
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -5604,7 +5604,7 @@ fn lock_exclusion() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -5732,7 +5732,7 @@ fn lock_dev_transitive() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 5 packages in [TIME]
"###);

Expand Down Expand Up @@ -7108,7 +7108,7 @@ fn lock_find_links_local_wheel() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -7154,7 +7154,7 @@ fn lock_find_links_local_wheel() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand All @@ -7165,7 +7165,7 @@ fn lock_find_links_local_wheel() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Prepared 1 package in [TIME]
Installed 2 packages in [TIME]
Expand Down Expand Up @@ -7226,7 +7226,7 @@ fn lock_find_links_local_sdist() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand Down Expand Up @@ -7270,7 +7270,7 @@ fn lock_find_links_local_sdist() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 2 packages in [TIME]
"###);

Expand All @@ -7281,7 +7281,7 @@ fn lock_find_links_local_sdist() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Prepared 2 packages in [TIME]
Installed 2 packages in [TIME]
Expand Down Expand Up @@ -8327,7 +8327,7 @@ fn lock_mixed_extras() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 6 packages in [TIME]
"###);

Expand Down Expand Up @@ -8431,7 +8431,7 @@ fn lock_mixed_extras() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 6 packages in [TIME]
"###);

Expand All @@ -8443,7 +8443,7 @@ fn lock_mixed_extras() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Prepared 4 packages in [TIME]
Installed 4 packages in [TIME]
Expand Down Expand Up @@ -8525,7 +8525,7 @@ fn lock_transitive_extra() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 4 packages in [TIME]
"###);

Expand Down Expand Up @@ -8610,7 +8610,7 @@ fn lock_transitive_extra() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Resolved 4 packages in [TIME]
"###);

Expand All @@ -8622,7 +8622,7 @@ fn lock_transitive_extra() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Prepared 2 packages in [TIME]
Installed 2 packages in [TIME]
Expand Down Expand Up @@ -12958,7 +12958,7 @@ fn lock_request_requires_python() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
error: The requested interpreter resolved to Python 3.12.[X], which is incompatible with the project's Python requirement: `>=3.8, <=3.10`
"###);

Expand All @@ -12972,7 +12972,7 @@ fn lock_request_requires_python() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
error: The Python request from `.python-version` resolved to Python 3.12.[X], which is incompatible with the project's Python requirement: `>=3.8, <=3.10`
"###);

Expand Down Expand Up @@ -13083,7 +13083,7 @@ fn lock_invalid_project_table() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
error: Failed to build: `b @ file://[TEMP_DIR]/b`
Caused by: Failed to extract static metadata from `pyproject.toml`
Caused by: `pyproject.toml` is using the `[project]` table, but the required `project.name` field is not set.
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/pip_sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5584,7 +5584,7 @@ fn sync_seed() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.8.[X] interpreter at: [PYTHON-3.8]
Using CPython 3.8.[X] interpreter at: [PYTHON-3.8]
Creating virtual environment with seed packages at: .venv
+ pip==24.0
+ setuptools==69.2.0
Expand Down
14 changes: 7 additions & 7 deletions crates/uv/tests/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fn run_with_python_version() -> Result<()> {
3.7.0

----- stderr -----
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: .venv
Resolved 5 packages in [TIME]
Prepared 4 packages in [TIME]
Expand Down Expand Up @@ -105,7 +105,7 @@ fn run_with_python_version() -> Result<()> {
3.6.0

----- stderr -----
Using Python 3.11.[X] interpreter at: [PYTHON-3.11]
Using CPython 3.11.[X] interpreter at: [PYTHON-3.11]
Removed virtual environment at: .venv
Creating virtual environment at: .venv
Resolved 5 packages in [TIME]
Expand Down Expand Up @@ -133,7 +133,7 @@ fn run_with_python_version() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.8.[X] interpreter at: [PYTHON-3.8]
Using CPython 3.8.[X] interpreter at: [PYTHON-3.8]
error: The requested interpreter resolved to Python 3.8.[X], which is incompatible with the project's Python requirement: `>=3.11, <4`
"###);

Expand Down Expand Up @@ -1414,7 +1414,7 @@ fn run_from_directory() -> Result<()> {

----- stderr -----
warning: `VIRTUAL_ENV=.venv` does not match the project environment path `[PROJECT_VENV]/` and will be ignored
Using Python 3.12.[X] interpreter at: [PYTHON-3.12]
Using CPython 3.12.[X] interpreter at: [PYTHON-3.12]
Creating virtual environment at: [PROJECT_VENV]/
Resolved 1 package in [TIME]
Prepared 1 package in [TIME]
Expand Down Expand Up @@ -1489,7 +1489,7 @@ fn run_from_directory() -> Result<()> {

----- stderr -----
warning: `VIRTUAL_ENV=.venv` does not match the project environment path `[PROJECT_VENV]/` and will be ignored
Using Python 3.10.[X] interpreter at: [PYTHON-3.10]
Using CPython 3.10.[X] interpreter at: [PYTHON-3.10]
Removed virtual environment at: [PROJECT_VENV]/
Creating virtual environment at: [PROJECT_VENV]/
Resolved 1 package in [TIME]
Expand Down Expand Up @@ -1600,7 +1600,7 @@ fn run_isolated_python_version() -> Result<()> {
(3, 8)

----- stderr -----
Using Python 3.8.[X] interpreter at: [PYTHON-3.8]
Using CPython 3.8.[X] interpreter at: [PYTHON-3.8]
Creating virtual environment at: .venv
Resolved 6 packages in [TIME]
Prepared 6 packages in [TIME]
Expand Down Expand Up @@ -1908,7 +1908,7 @@ fn run_isolated_incompatible_python() -> Result<()> {
----- stdout -----

----- stderr -----
Using Python 3.8.[X] interpreter at: [PYTHON-3.8]
Using CPython 3.8.[X] interpreter at: [PYTHON-3.8]
error: The Python request from `.python-version` resolved to Python 3.8.[X], which is incompatible with the project's Python requirement: `>=3.12`
"###);

Expand Down
Loading