mirrors/uv
1
0
Fork 0
mirror of https://github.com/astral-sh/uv.git synced 2025-08-04 19:08:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Support editables in uv sync (#3692)

Browse source 
This is bare-bones support for editables in `uv sync` as basis for
workspace support, notably without lockfile integration. It leverages
the existing `ResolvedEditables` infrastructure.
This commit is contained in:
konsti 2024-05-21 13:30:15 +02:00 • committed by GitHub
parent d326e1f5e9
commit fbae55019e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
crates/uv/src/commands/project/lock.rs
View file

@ -111,7 +111,8 @@ pub(crate) async fn lock(
.build();
// Build all editable distributions. The editables are shared between resolution and
// installation, and should live for the duration of the command.
// installation, and should live for the duration of the command. If an editable is already
// installed in the environment, we'll still re-build it here.
let editables = ResolvedEditables::resolve(
spec.editables.clone(),
&EmptyInstalledPackages,

6
crates/uv/src/commands/project/mod.rs
View file

@ -165,7 +165,7 @@ pub(crate) async fn resolve<InstalledPackages: InstalledPackagesProvider>(
let requirements = {
// Convert from unnamed to named requirements.
let mut requirements = NamedRequirementsResolver::new(
requirements,
requirements.clone(),
hasher,
index,
DistributionDatabase::new(client, build_dispatch, concurrency.downloads),
@ -178,7 +178,7 @@ pub(crate) async fn resolve<InstalledPackages: InstalledPackagesProvider>(
if !source_trees.is_empty() {
requirements.extend(
SourceTreeResolver::new(
source_trees,
source_trees.clone(),
&ExtrasSpecification::None,
hasher,
index,
@ -214,7 +214,7 @@ pub(crate) async fn resolve<InstalledPackages: InstalledPackagesProvider>(
constraints,
overrides,
preferences,
project,
project.clone(),
editable_metadata,
exclusions,
lookaheads,

21
crates/uv/src/commands/project/sync.rs
View file

@ -5,7 +5,7 @@ use install_wheel_rs::linker::LinkMode;
use uv_cache::Cache;
use uv_client::RegistryClientBuilder;
use uv_configuration::{
Concurrency, ConfigSettings, NoBinary, NoBuild, PreviewMode, SetupPyStrategy,
Concurrency, ConfigSettings, NoBinary, NoBuild, PreviewMode, Reinstall, SetupPyStrategy,
};
use uv_dispatch::BuildDispatch;
use uv_installer::SitePackages;
@ -55,6 +55,8 @@ pub(crate) async fn sync(
.platform(venv.interpreter().platform())
.build();
let site_packages = SitePackages::from_executable(&venv)?;
// TODO(charlie): Respect project configuration.
let build_isolation = BuildIsolation::default();
let config_settings = ConfigSettings::default();
@ -68,6 +70,7 @@ pub(crate) async fn sync(
let no_build = NoBuild::default();
let setup_py = SetupPyStrategy::default();
let concurrency = Concurrency::default();
let reinstall = Reinstall::None;
// Create a build dispatch.
let build_dispatch = BuildDispatch::new(
@ -87,8 +90,20 @@ pub(crate) async fn sync(
concurrency,
);
// TODO(konsti): Read editables from lockfile.
let editables = ResolvedEditables::default();
let editables = ResolvedEditables::resolve(
Vec::new(), // TODO(konsti): Read editables from lockfile
&site_packages,
&reinstall,
&hasher,
venv.interpreter(),
tags,
cache,
&client,
&build_dispatch,
concurrency,
printer,
)
.await?;
let site_packages = SitePackages::from_executable(&venv)?;