mirror of
https://github.com/astral-sh/uv.git
synced 2025-10-01 14:31:12 +00:00
uv init
discovers workspace from the target path (#5250)
## Summary Resolves #5249 ## Test Plan
This commit is contained in:
parent
fb091af9fc
commit
178300d16b
2 changed files with 103 additions and 6 deletions
|
@ -26,13 +26,7 @@ pub(crate) async fn init(
|
||||||
warn_user_once!("`uv init` is experimental and may change without warning");
|
warn_user_once!("`uv init` is experimental and may change without warning");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Discover the current workspace, if it exists.
|
|
||||||
let current_dir = std::env::current_dir()?.canonicalize()?;
|
let current_dir = std::env::current_dir()?.canonicalize()?;
|
||||||
let workspace = match ProjectWorkspace::discover(¤t_dir, None).await {
|
|
||||||
Ok(project) => Some(project),
|
|
||||||
Err(WorkspaceError::MissingPyprojectToml) => None,
|
|
||||||
Err(err) => return Err(err.into()),
|
|
||||||
};
|
|
||||||
|
|
||||||
// Default to the current directory if a path was not provided.
|
// Default to the current directory if a path was not provided.
|
||||||
let path = match explicit_path {
|
let path = match explicit_path {
|
||||||
|
@ -72,6 +66,13 @@ pub(crate) async fn init(
|
||||||
// Canonicalize the path to the project.
|
// Canonicalize the path to the project.
|
||||||
let path = path.canonicalize()?;
|
let path = path.canonicalize()?;
|
||||||
|
|
||||||
|
// Discover the current workspace, if it exists.
|
||||||
|
let workspace = match ProjectWorkspace::discover(&path, None).await {
|
||||||
|
Ok(project) => Some(project),
|
||||||
|
Err(WorkspaceError::MissingPyprojectToml) => None,
|
||||||
|
Err(err) => return Err(err.into()),
|
||||||
|
};
|
||||||
|
|
||||||
// Create the `pyproject.toml`.
|
// Create the `pyproject.toml`.
|
||||||
let pyproject = indoc::formatdoc! {r#"
|
let pyproject = indoc::formatdoc! {r#"
|
||||||
[project]
|
[project]
|
||||||
|
|
|
@ -364,3 +364,99 @@ fn init_workspace_relative_sub_package() -> Result<()> {
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn init_workspace_outside() -> Result<()> {
|
||||||
|
let context = TestContext::new("3.12");
|
||||||
|
|
||||||
|
let pyproject_toml = context.temp_dir.child("pyproject.toml");
|
||||||
|
pyproject_toml.write_str(indoc! {
|
||||||
|
r#"
|
||||||
|
[project]
|
||||||
|
name = "project"
|
||||||
|
version = "0.1.0"
|
||||||
|
requires-python = ">=3.12"
|
||||||
|
dependencies = ["anyio==3.7.0"]
|
||||||
|
"#,
|
||||||
|
})?;
|
||||||
|
|
||||||
|
let child = context.temp_dir.join("foo");
|
||||||
|
fs_err::create_dir(&child)?;
|
||||||
|
|
||||||
|
// Run `uv init <path>` outside the workspace.
|
||||||
|
uv_snapshot!(context.filters(), context.init().current_dir(&context.home_dir).arg(&child), @r###"
|
||||||
|
success: true
|
||||||
|
exit_code: 0
|
||||||
|
----- stdout -----
|
||||||
|
|
||||||
|
----- stderr -----
|
||||||
|
warning: `uv init` is experimental and may change without warning
|
||||||
|
Adding foo as member of workspace [TEMP_DIR]/
|
||||||
|
Initialized project foo in [TEMP_DIR]/foo
|
||||||
|
"###);
|
||||||
|
|
||||||
|
let pyproject = fs_err::read_to_string(child.join("pyproject.toml"))?;
|
||||||
|
let init_py = fs_err::read_to_string(child.join("src/foo/__init__.py"))?;
|
||||||
|
|
||||||
|
let _ = fs_err::read_to_string(child.join("README.md")).unwrap();
|
||||||
|
|
||||||
|
insta::with_settings!({
|
||||||
|
filters => context.filters(),
|
||||||
|
}, {
|
||||||
|
assert_snapshot!(
|
||||||
|
pyproject, @r###"
|
||||||
|
[project]
|
||||||
|
name = "foo"
|
||||||
|
version = "0.1.0"
|
||||||
|
description = "Add your description here"
|
||||||
|
readme = "README.md"
|
||||||
|
dependencies = []
|
||||||
|
|
||||||
|
[tool.uv]
|
||||||
|
dev-dependencies = []
|
||||||
|
"###
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
insta::with_settings!({
|
||||||
|
filters => context.filters(),
|
||||||
|
}, {
|
||||||
|
assert_snapshot!(
|
||||||
|
init_py, @r###"
|
||||||
|
def hello() -> str:
|
||||||
|
return "Hello from foo!"
|
||||||
|
"###
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
let workspace = fs_err::read_to_string(context.temp_dir.join("pyproject.toml"))?;
|
||||||
|
insta::with_settings!({
|
||||||
|
filters => context.filters(),
|
||||||
|
}, {
|
||||||
|
assert_snapshot!(
|
||||||
|
workspace, @r###"
|
||||||
|
[project]
|
||||||
|
name = "project"
|
||||||
|
version = "0.1.0"
|
||||||
|
requires-python = ">=3.12"
|
||||||
|
dependencies = ["anyio==3.7.0"]
|
||||||
|
|
||||||
|
[tool.uv.workspace]
|
||||||
|
members = ["foo"]
|
||||||
|
"###
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Run `uv lock` in the workspace.
|
||||||
|
uv_snapshot!(context.filters(), context.lock(), @r###"
|
||||||
|
success: true
|
||||||
|
exit_code: 0
|
||||||
|
----- stdout -----
|
||||||
|
|
||||||
|
----- stderr -----
|
||||||
|
warning: `uv lock` is experimental and may change without warning
|
||||||
|
Resolved 5 packages in [TIME]
|
||||||
|
"###);
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue