Skip to content

Commit

Permalink
Use more verbose spelling of "virtualenv" during creation (#7523)
Browse files Browse the repository at this point in the history
This stands out alongside other messaging which uses the longer spelling
"virtual environment"
  • Loading branch information
zanieb authored Sep 19, 2024
1 parent e36cc99 commit 7778a11
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 86 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 [email protected] -- python --version
Expand Down Expand Up @@ -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
```

Expand Down
2 changes: 1 addition & 1 deletion crates/uv-virtualenv/src/virtualenv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
),
)));
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/src/commands/project/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)?;

Expand Down
2 changes: 1 addition & 1 deletion crates/uv/src/commands/venv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
)
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/edit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 3 additions & 3 deletions crates/uv/tests/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
"###);
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
8 changes: 4 additions & 4 deletions crates/uv/tests/lock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion crates/uv/tests/pip_sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions crates/uv/tests/run.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
22 changes: 11 additions & 11 deletions crates/uv/tests/sync.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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]
Expand Down Expand Up @@ -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]
Expand Down
Loading

0 comments on commit 7778a11

Please sign in to comment.