From 7778a11b2d51f2762a373c5a6e3ff69e44816f4f Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Wed, 18 Sep 2024 21:22:37 -0500 Subject: [PATCH] Use more verbose spelling of "virtualenv" during creation (#7523) This stands out alongside other messaging which uses the longer spelling "virtual environment" --- README.md | 6 +- crates/uv-virtualenv/src/virtualenv.rs | 2 +- crates/uv/src/commands/project/mod.rs | 2 +- crates/uv/src/commands/venv.rs | 2 +- crates/uv/tests/edit.rs | 2 +- crates/uv/tests/init.rs | 6 +- crates/uv/tests/lock.rs | 8 +-- crates/uv/tests/pip_sync.rs | 2 +- crates/uv/tests/run.rs | 8 +-- crates/uv/tests/sync.rs | 22 +++--- crates/uv/tests/venv.rs | 98 +++++++++++++------------- crates/uv/tests/workspace.rs | 8 +-- docs/index.md | 6 +- 13 files changed, 86 insertions(+), 86 deletions(-) diff --git a/README.md b/README.md index 8962db51203b..c541a5a2b6f8 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ Initialized project `example` at `/home/user/example` $ cd example $ uv add ruff -Creating virtualenv at: .venv +Creating virtual environment at: .venv Resolved 2 packages in 170ms Built example @ file:///home/user/example Prepared 2 packages in 627ms @@ -155,7 +155,7 @@ Download Python versions as needed: ```console $ uv venv --python 3.12.0 Using Python 3.12.0 -Creating virtualenv at: .venv +Creating virtual environment at: .venv Activate with: source .venv/bin/activate $ uv run --python pypy@3.8 -- python --version @@ -224,7 +224,7 @@ Create a virtual environment: ```console $ uv venv Using Python 3.12.3 -Creating virtualenv at: .venv +Creating virtual environment at: .venv Activate with: source .venv/bin/activate ``` diff --git a/crates/uv-virtualenv/src/virtualenv.rs b/crates/uv-virtualenv/src/virtualenv.rs index e51cccfa23e7..cc33e4cb5940 100644 --- a/crates/uv-virtualenv/src/virtualenv.rs +++ b/crates/uv-virtualenv/src/virtualenv.rs @@ -108,7 +108,7 @@ pub(crate) fn create( return Err(Error::Io(io::Error::new( io::ErrorKind::AlreadyExists, format!( - "The directory `{}` exists, but it's not a virtualenv", + "The directory `{}` exists, but it's not a virtual environment", location.user_display() ), ))); diff --git a/crates/uv/src/commands/project/mod.rs b/crates/uv/src/commands/project/mod.rs index 56907f74e83f..87acc01381d9 100644 --- a/crates/uv/src/commands/project/mod.rs +++ b/crates/uv/src/commands/project/mod.rs @@ -503,7 +503,7 @@ pub(crate) async fn get_or_init_environment( writeln!( printer.stderr(), - "Creating virtualenv at: {}", + "Creating virtual environment at: {}", venv.user_display().cyan() )?; diff --git a/crates/uv/src/commands/venv.rs b/crates/uv/src/commands/venv.rs index 7f410d92a3ba..39d957a5c1d3 100644 --- a/crates/uv/src/commands/venv.rs +++ b/crates/uv/src/commands/venv.rs @@ -244,7 +244,7 @@ async fn venv_impl( writeln!( printer.stderr(), - "Creating virtualenv {}at: {}", + "Creating virtual environment {}at: {}", if seed { "with seed packages " } else { "" }, path.user_display().cyan() ) diff --git a/crates/uv/tests/edit.rs b/crates/uv/tests/edit.rs index e1c186ed8a97..f73b4954513c 100644 --- a/crates/uv/tests/edit.rs +++ b/crates/uv/tests/edit.rs @@ -2040,7 +2040,7 @@ fn add_path() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 2 packages in [TIME] Prepared 2 packages in [TIME] Installed 2 packages in [TIME] diff --git a/crates/uv/tests/init.rs b/crates/uv/tests/init.rs index 4c7092219266..719e2ff59382 100644 --- a/crates/uv/tests/init.rs +++ b/crates/uv/tests/init.rs @@ -128,7 +128,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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 1 package in [TIME] Audited in [TIME] "###); @@ -309,7 +309,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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] @@ -391,7 +391,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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] diff --git a/crates/uv/tests/lock.rs b/crates/uv/tests/lock.rs index 86abfcb651d7..fafbf581dec6 100644 --- a/crates/uv/tests/lock.rs +++ b/crates/uv/tests/lock.rs @@ -7166,7 +7166,7 @@ fn lock_find_links_local_wheel() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Prepared 1 package in [TIME] Installed 2 packages in [TIME] + project==0.1.0 (from file://[TEMP_DIR]/workspace) @@ -7282,7 +7282,7 @@ fn lock_find_links_local_sdist() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Prepared 2 packages in [TIME] Installed 2 packages in [TIME] + project==0.1.0 (from file://[TEMP_DIR]/workspace) @@ -8444,7 +8444,7 @@ fn lock_mixed_extras() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Prepared 4 packages in [TIME] Installed 4 packages in [TIME] + leaf1==0.1.0 (from file://[TEMP_DIR]/workspace1/packages/leaf1) @@ -8623,7 +8623,7 @@ fn lock_transitive_extra() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Prepared 2 packages in [TIME] Installed 2 packages in [TIME] + leaf==0.1.0 (from file://[TEMP_DIR]/workspace/packages/leaf) diff --git a/crates/uv/tests/pip_sync.rs b/crates/uv/tests/pip_sync.rs index 96ad4344d1f3..a1b46f7b558d 100644 --- a/crates/uv/tests/pip_sync.rs +++ b/crates/uv/tests/pip_sync.rs @@ -5585,7 +5585,7 @@ fn sync_seed() -> Result<()> { ----- stderr ----- Using Python 3.8.[X] interpreter at: [PYTHON-3.8] - Creating virtualenv with seed packages at: .venv + Creating virtual environment with seed packages at: .venv + pip==24.0 + setuptools==69.2.0 + wheel==0.43.0 diff --git a/crates/uv/tests/run.rs b/crates/uv/tests/run.rs index eb13cbc6fa54..7c61239ea9d0 100644 --- a/crates/uv/tests/run.rs +++ b/crates/uv/tests/run.rs @@ -56,7 +56,7 @@ fn run_with_python_version() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 5 packages in [TIME] Prepared 4 packages in [TIME] Installed 4 packages in [TIME] @@ -106,7 +106,7 @@ fn run_with_python_version() -> Result<()> { ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] Removed virtual environment at: .venv - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 5 packages in [TIME] Prepared 1 package in [TIME] Installed 4 packages in [TIME] @@ -1364,7 +1364,7 @@ fn run_from_directory() -> 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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 1 package in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] @@ -1463,7 +1463,7 @@ fn run_isolated_python_version() -> Result<()> { ----- stderr ----- Using Python 3.8.[X] interpreter at: [PYTHON-3.8] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 6 packages in [TIME] Prepared 6 packages in [TIME] Installed 6 packages in [TIME] diff --git a/crates/uv/tests/sync.rs b/crates/uv/tests/sync.rs index 7fcc80c3d8bb..e8b8aa0834b4 100644 --- a/crates/uv/tests/sync.rs +++ b/crates/uv/tests/sync.rs @@ -359,7 +359,7 @@ fn mixed_requires_python() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 5 packages in [TIME] Prepared 5 packages in [TIME] Installed 5 packages in [TIME] @@ -1189,7 +1189,7 @@ fn no_install_workspace() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Installed 4 packages in [TIME] + anyio==3.7.0 + idna==3.6 @@ -1652,7 +1652,7 @@ fn sync_custom_environment_path() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: foo + Creating virtual environment at: foo Resolved 2 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -1677,7 +1677,7 @@ fn sync_custom_environment_path() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: foobar/.venv + Creating virtual environment at: foobar/.venv Resolved 2 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -1702,7 +1702,7 @@ fn sync_custom_environment_path() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: bar + Creating virtual environment at: bar Resolved 2 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -1723,7 +1723,7 @@ fn sync_custom_environment_path() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: [OTHER_TEMPDIR]/.venv + Creating virtual environment at: [OTHER_TEMPDIR]/.venv Resolved 2 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -1803,7 +1803,7 @@ fn sync_workspace_custom_environment_path() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: foo + Creating virtual environment at: foo Resolved 3 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -1959,7 +1959,7 @@ fn sync_virtual_env_warning() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: foo + Creating virtual environment at: foo Resolved 2 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -1974,7 +1974,7 @@ fn sync_virtual_env_warning() -> Result<()> { ----- stderr ----- warning: `VIRTUAL_ENV=foo` does not match the project environment path `bar` and will be ignored Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: bar + Creating virtual environment at: bar Resolved 2 packages in [TIME] Installed 1 package in [TIME] + iniconfig==2.0.0 @@ -2036,7 +2036,7 @@ fn sync_update_project() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 2 packages in [TIME] Prepared 2 packages in [TIME] Installed 2 packages in [TIME] @@ -2099,7 +2099,7 @@ fn sync_environment_prompt() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 2 packages in [TIME] Prepared 1 package in [TIME] Installed 1 package in [TIME] diff --git a/crates/uv/tests/venv.rs b/crates/uv/tests/venv.rs index 2e3c1bfcd5c9..4df40ce6fa6c 100644 --- a/crates/uv/tests/venv.rs +++ b/crates/uv/tests/venv.rs @@ -26,7 +26,7 @@ fn create_venv() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -44,7 +44,7 @@ fn create_venv() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -64,7 +64,7 @@ fn create_venv_project_environment() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -94,7 +94,7 @@ fn create_venv_project_environment() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: foo + Creating virtual environment at: foo Activate with: source foo/bin/activate "### ); @@ -115,7 +115,7 @@ fn create_venv_project_environment() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -132,7 +132,7 @@ fn create_venv_project_environment() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: bar + Creating virtual environment at: bar Activate with: source bar/bin/activate "### ); @@ -150,7 +150,7 @@ fn create_venv_project_environment() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -162,7 +162,7 @@ fn create_venv_project_environment() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -182,7 +182,7 @@ fn create_venv_defaults_to_cwd() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -203,7 +203,7 @@ fn create_venv_ignores_virtual_env_variable() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -221,7 +221,7 @@ fn create_venv_reads_request_from_python_version_file() { ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -240,7 +240,7 @@ fn create_venv_reads_request_from_python_version_file() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -260,7 +260,7 @@ fn create_venv_reads_request_from_python_versions_file() { ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -279,7 +279,7 @@ fn create_venv_reads_request_from_python_versions_file() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -292,16 +292,16 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { let context = TestContext::new_with_versions(&["3.11", "3.9", "3.10", "3.12"]); // Without a Python requirement, we use the first on the PATH - uv_snapshot!(context.filters(), context.venv(), @r#" + uv_snapshot!(context.filters(), context.venv(), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate - "# + "### ); // With `requires-python = "<3.11"`, we prefer the first available version @@ -322,7 +322,7 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { ----- stderr ----- Using Python 3.9.[X] interpreter at: [PYTHON-3.9] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -338,16 +338,16 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { "# })?; - uv_snapshot!(context.filters(), context.venv(), @r#" + uv_snapshot!(context.filters(), context.venv(), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate - "# + "### ); // With `requires-python = ">=3.11,<3.12"`, we prefer exact version (3.11) @@ -361,16 +361,16 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { "# })?; - uv_snapshot!(context.filters(), context.venv(), @r#" + uv_snapshot!(context.filters(), context.venv(), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate - "# + "### ); // With `requires-python = ">=3.10"`, we prefer first compatible version (3.11) @@ -395,16 +395,16 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { "# })?; - uv_snapshot!(context.filters(), context.venv(), @r#" + uv_snapshot!(context.filters(), context.venv(), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate - "# + "### ); // With `requires-python = ">3.11"`, we prefer first compatible version (3.11) @@ -418,16 +418,16 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { "# })?; - uv_snapshot!(context.filters(), context.venv(), @r#" + uv_snapshot!(context.filters(), context.venv(), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate - "# + "### ); // With `requires-python = ">=3.12"`, we prefer first compatible version (3.12) @@ -441,16 +441,16 @@ fn create_venv_respects_pyproject_requires_python() -> Result<()> { "# })?; - uv_snapshot!(context.filters(), context.venv(), @r#" + uv_snapshot!(context.filters(), context.venv(), @r###" success: true exit_code: 0 ----- stdout ----- ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate - "# + "### ); context.venv.assert(predicates::path::is_dir()); @@ -472,7 +472,7 @@ fn create_venv_ignores_missing_pyproject_metadata() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -497,7 +497,7 @@ fn create_venv_warns_user_on_requires_python_discovery_error() -> Result<()> { ----- stderr ----- warning: Failed to parse: `pyproject.toml` Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -524,7 +524,7 @@ fn create_venv_explicit_request_takes_priority_over_python_version_file() { ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -546,7 +546,7 @@ fn seed() { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv with seed packages at: .venv + Creating virtual environment with seed packages at: .venv + pip==24.0 Activate with: source .venv/bin/activate "### @@ -569,7 +569,7 @@ fn seed_older_python_version() { ----- stderr ----- Using Python 3.11.[X] interpreter at: [PYTHON-3.11] - Creating virtualenv with seed packages at: .venv + Creating virtual environment with seed packages at: .venv + pip==24.0 + setuptools==69.2.0 + wheel==0.43.0 @@ -671,7 +671,7 @@ fn create_venv_python_patch() { ----- stderr ----- Using Python 3.12.1 interpreter at: [PYTHON-3.12.1] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -696,7 +696,7 @@ fn file_exists() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv uv::venv::creation × Failed to create virtualenv @@ -723,7 +723,7 @@ fn empty_dir_exists() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -751,11 +751,11 @@ fn non_empty_dir_exists() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv uv::venv::creation × Failed to create virtualenv - ╰─▶ The directory `.venv` exists, but it's not a virtualenv + ╰─▶ The directory `.venv` exists, but it's not a virtual environment "### ); @@ -781,11 +781,11 @@ fn non_empty_dir_exists_allow_existing() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv uv::venv::creation × Failed to create virtualenv - ╰─▶ The directory `.venv` exists, but it's not a virtualenv + ╰─▶ The directory `.venv` exists, but it's not a virtual environment "### ); @@ -800,7 +800,7 @@ fn non_empty_dir_exists_allow_existing() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -818,7 +818,7 @@ fn non_empty_dir_exists_allow_existing() -> Result<()> { ----- stderr ----- Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -863,7 +863,7 @@ fn windows_shims() -> Result<()> { ----- stderr ----- Using Python 3.8.[X] interpreter at: [PYTHON-3.8] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); @@ -890,7 +890,7 @@ fn virtualenv_compatibility() { ----- stderr ----- warning: virtualenv's `--clear` has no effect (uv always clears the virtual environment) Using Python 3.12.[X] interpreter at: [PYTHON-3.12] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Activate with: source .venv/bin/activate "### ); diff --git a/crates/uv/tests/workspace.rs b/crates/uv/tests/workspace.rs index 31f474b52f52..d454b30ffd56 100644 --- a/crates/uv/tests/workspace.rs +++ b/crates/uv/tests/workspace.rs @@ -379,7 +379,7 @@ fn test_uv_run_with_package_virtual_workspace() -> 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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 8 packages in [TIME] Prepared 5 packages in [TIME] Installed 5 packages in [TIME] @@ -439,7 +439,7 @@ fn test_uv_run_virtual_workspace_root() -> 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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 8 packages in [TIME] Prepared 7 packages in [TIME] Installed 7 packages in [TIME] @@ -484,7 +484,7 @@ fn test_uv_run_with_package_root_workspace() -> 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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 8 packages in [TIME] Prepared 5 packages in [TIME] Installed 5 packages in [TIME] @@ -549,7 +549,7 @@ fn test_uv_run_isolate() -> 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] - Creating virtualenv at: .venv + Creating virtual environment at: .venv Resolved 8 packages in [TIME] Prepared 7 packages in [TIME] Installed 7 packages in [TIME] diff --git a/docs/index.md b/docs/index.md index 482ad0babc19..656f96bcd9b3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -69,7 +69,7 @@ Initialized project `example` at `/home/user/example` $ cd example $ uv add ruff -Creating virtualenv at: .venv +Creating virtual environment at: .venv Resolved 2 packages in 170ms Built example @ file:///home/user/example Prepared 2 packages in 627ms @@ -143,7 +143,7 @@ Download Python versions as needed: ```console $ uv venv --python 3.12.0 Using Python 3.12.0 -Creating virtualenv at: .venv +Creating virtual environment at: .venv Activate with: source .venv/bin/activate $ uv run --python pypy@3.8 -- python --version @@ -211,7 +211,7 @@ Create a virtual environment: ```console $ uv venv Using Python 3.12.3 -Creating virtualenv at: .venv +Creating virtual environment at: .venv Activate with: source .venv/bin/activate ```