Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 10 additions & 5 deletions crates/uv/src/commands/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use uv_warnings::warn_user;
use uv_workspace::pyproject_mut::Error;
use uv_workspace::{
pyproject_mut::{DependencyTarget, PyProjectTomlMut},
DiscoveryOptions, Workspace, WorkspaceCache,
DiscoveryOptions, ProjectWorkspace, WorkspaceCache,
};

use crate::{commands::ExitStatus, printer::Printer};
Expand Down Expand Up @@ -43,8 +43,12 @@ pub(crate) async fn project_version(
printer: Printer,
) -> Result<ExitStatus> {
// Read the metadata
let workspace = match Workspace::discover(project_dir, &DiscoveryOptions::default(), cache)
.await
let workspace = match ProjectWorkspace::discover(
project_dir,
&DiscoveryOptions::default(),
cache,
)
.await
{
Ok(workspace) => workspace,
Err(err) => {
Expand All @@ -59,11 +63,12 @@ pub(crate) async fn project_version(
};

let mut pyproject = PyProjectTomlMut::from_toml(
&workspace.pyproject_toml().raw,
&workspace.current_project().pyproject_toml().raw,
DependencyTarget::PyProjectToml,
)?;
let pyproject_path = workspace.install_path().join("pyproject.toml");
let pyproject_path = workspace.current_project().root().join("pyproject.toml");
let name = workspace
.current_project()
.pyproject_toml()
.project
.as_ref()
Expand Down
71 changes: 67 additions & 4 deletions crates/uv/tests/it/version.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use anyhow::{Ok, Result};
use assert_cmd::assert::OutputAssertExt;
use assert_fs::prelude::*;
use insta::assert_snapshot;

Expand Down Expand Up @@ -827,7 +828,7 @@ fn version_get_fallback_unmanaged() -> Result<()> {
[project]
name = "myapp"
version = "0.1.2"

[tool.uv]
managed = false
"#,
Expand Down Expand Up @@ -869,7 +870,7 @@ fn version_get_fallback_unmanaged_short() -> Result<()> {
[project]
name = "myapp"
version = "0.1.2"

[tool.uv]
managed = false
"#,
Expand Down Expand Up @@ -920,7 +921,7 @@ fn version_get_fallback_unmanaged_json() -> Result<()> {
[project]
name = "myapp"
version = "0.1.2"

[tool.uv]
managed = false
"#,
Expand Down Expand Up @@ -992,7 +993,7 @@ fn version_get_fallback_unmanaged_strict() -> Result<()> {
[project]
name = "myapp"
version = "0.1.2"

[tool.uv]
managed = false
"#,
Expand Down Expand Up @@ -1206,3 +1207,65 @@ fn self_version_json() -> Result<()> {
);
Ok(())
}

// Ensure that the global `--project` option is respected.
#[test]
fn version_get_workspace() -> Result<()> {
let context = TestContext::new("3.12");

let pyproject_toml = context.temp_dir.child("pyproject.toml");
pyproject_toml.write_str(
r#"
[project]
name = "myproject"
version = "1.10.31"
requires-python = ">=3.12"
"#,
)?;

context
.init()
.arg("--lib")
.arg("workspace-member")
.assert()
.success();

uv_snapshot!(context.filters(), context.version().arg("--project").arg(context.temp_dir.as_ref()), @r"
success: true
exit_code: 0
----- stdout -----
myproject 1.10.31

----- stderr -----
");

uv_snapshot!(context.filters(), context.version().arg("--project").arg(context.temp_dir.join("workspace-member")), @r"
success: true
exit_code: 0
----- stdout -----
workspace-member 0.1.0

----- stderr -----
");

pyproject_toml.write_str(
r#"
[tool.uv.workspace]
members = ["workspace-member"]
"#,
)?;

// A virtual project root has a no version.
// TODO(konsti): Show a dedicated error message for virtual workspace roots (generally, not
// only for `uv version`)
uv_snapshot!(context.filters(), context.version().arg("--project").arg(context.temp_dir.as_ref()), @r"
success: false
exit_code: 2
----- stdout -----

----- stderr -----
error: No `project` table found in: `[TEMP_DIR]/pyproject.toml`
");

Ok(())
}
Loading