update for rebase

astral-sh · Jun 10, 2024 · c8f0d20 · c8f0d20
1 parent 1a3da09
commit c8f0d20
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/crates/uv/src/commands/project/add.rs b/crates/uv/src/commands/project/add.rs
@@ -27,8 +27,8 @@ pub(crate) async fn add(
 
     // Find the project requirements.
     let project = ProjectWorkspace::discover(&std::env::current_dir()?, None).await?;
-    let mut pyproject = PyProjectTomlMut::from_toml(project.current_project().pyproject_toml())?;
 
+    let mut pyproject = PyProjectTomlMut::from_toml(project.current_project().pyproject_toml())?;
     for req in requirements {
         let req = Requirement::from(LenientRequirement::from_str(&req)?);
         pyproject.add_dependency(&req)?;
@@ -41,7 +41,7 @@ pub(crate) async fn add(
     )?;
 
     // Discover or create the virtual environment.
-    let venv = project::init_environment(&project, preview, cache, printer)?;
+    let venv = project::init_environment(project.workspace(), preview, cache, printer)?;
 
     let index_locations = IndexLocations::default();
     let upgrade = Upgrade::default();
@@ -50,9 +50,17 @@ pub(crate) async fn add(
     let dev = false; // We only add regular dependencies currently.
 
     // Lock and sync the environment.
+    let root_project_name = project
+        .current_project()
+        .pyproject_toml()
+        .project
+        .as_ref()
+        .map(|project| project.name.clone());
+
     let lock = project::lock::do_lock(
-        &project,
-        &venv,
+        root_project_name,
+        project.workspace(),
+        venv.interpreter(),
         &index_locations,
         upgrade,
         exclude_newer,

diff --git a/crates/uv/src/commands/project/remove.rs b/crates/uv/src/commands/project/remove.rs
@@ -27,8 +27,8 @@ pub(crate) async fn remove(
 
     // Find the project requirements.
     let project = ProjectWorkspace::discover(&std::env::current_dir()?, None).await?;
-    let mut pyproject = PyProjectTomlMut::from_toml(project.current_project().pyproject_toml())?;
 
+    let mut pyproject = PyProjectTomlMut::from_toml(project.current_project().pyproject_toml())?;
     for req in requirements {
         let req = Requirement::from(LenientRequirement::from_str(&req)?);
         if pyproject.remove_dependency(&req)?.is_none() {
@@ -46,7 +46,7 @@ pub(crate) async fn remove(
     )?;
 
     // Discover or create the virtual environment.
-    let venv = project::init_environment(&project, preview, cache, printer)?;
+    let venv = project::init_environment(project.workspace(), preview, cache, printer)?;
 
     let index_locations = IndexLocations::default();
     let upgrade = Upgrade::default();
@@ -55,9 +55,17 @@ pub(crate) async fn remove(
     let dev = false; // We only add regular dependencies currently.
 
     // Lock and sync the environment.
+    let root_project_name = project
+        .current_project()
+        .pyproject_toml()
+        .project
+        .as_ref()
+        .map(|project| project.name.clone());
+
     let lock = project::lock::do_lock(
-        &project,
-        &venv,
+        root_project_name,
+        project.workspace(),
+        venv.interpreter(),
         &index_locations,
         upgrade,
         exclude_newer,