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

Add support for --no-strip-markers in pip compile output (#4503)

Browse source 
## Summary

This is an intermediary change in enabling universal resolution for
`requirements.txt` files. To start, we need to be able to preserve
markers in the `requirements.txt` output _and_ propagate those markers,
such that if you have a dependency that's only included with a given
marker, the transitive dependencies respect that marker too.

Closes #1429.
This commit is contained in:
Charlie Marsh 2024-06-25 16:55:58 -04:00 • committed by GitHub
parent af1f1369e5
commit 5732209be3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 488 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

53
crates/uv-resolver/src/resolver/mod.rs
View file

@ -1589,14 +1589,17 @@ impl SolveState {
continue;
}
let PubGrubPackageInner::Package {
name: ref self_name,
extra: ref self_extra,
dev: ref self_dev,
..
} = &**self_package
else {
continue;
let (self_name, self_extra, self_dev) = match &**self_package {
PubGrubPackageInner::Package {
name: self_name,
extra: self_extra,
dev: self_dev,
..
} => (Some(self_name), self_extra.as_ref(), self_dev.as_ref()),
PubGrubPackageInner::Root(_) => (None, None, None),
_ => continue,
};
match **dependency_package {
@ -1606,17 +1609,17 @@ impl SolveState {
dev: ref dependency_dev,
..
} => {
if self_name == dependency_name {
if self_name.is_some_and(|self_name| self_name == dependency_name) {
continue;
}
let names = ResolutionDependencyNames {
from: self_name.clone(),
from: self_name.cloned(),
to: dependency_name.clone(),
};
let versions = ResolutionDependencyVersions {
from_version: self_version.clone(),
from_extra: self_extra.clone(),
from_dev: self_dev.clone(),
from_extra: self_extra.cloned(),
from_dev: self_dev.cloned(),
to_version: dependency_version.clone(),
to_extra: dependency_extra.clone(),
to_dev: dependency_dev.clone(),
@ -1630,17 +1633,17 @@ impl SolveState {
marker: ref dependency_marker,
..
} => {
if self_name == dependency_name {
if self_name.is_some_and(|self_name| self_name == dependency_name) {
continue;
}
let names = ResolutionDependencyNames {
from: self_name.clone(),
from: self_name.cloned(),
to: dependency_name.clone(),
};
let versions = ResolutionDependencyVersions {
from_version: self_version.clone(),
from_extra: self_extra.clone(),
from_dev: self_dev.clone(),
from_extra: self_extra.cloned(),
from_dev: self_dev.cloned(),
to_version: dependency_version.clone(),
to_extra: None,
to_dev: None,
@ -1655,17 +1658,17 @@ impl SolveState {
marker: ref dependency_marker,
..
} => {
if self_name == dependency_name {
if self_name.is_some_and(|self_name| self_name == dependency_name) {
continue;
}
let names = ResolutionDependencyNames {
from: self_name.clone(),
from: self_name.cloned(),
to: dependency_name.clone(),
};
let versions = ResolutionDependencyVersions {
from_version: self_version.clone(),
from_extra: self_extra.clone(),
from_dev: self_dev.clone(),
from_extra: self_extra.cloned(),
from_dev: self_dev.cloned(),
to_version: dependency_version.clone(),
to_extra: Some(dependency_extra.clone()),
to_dev: None,
@ -1680,17 +1683,17 @@ impl SolveState {
marker: ref dependency_marker,
..
} => {
if self_name == dependency_name {
if self_name.is_some_and(|self_name| self_name == dependency_name) {
continue;
}
let names = ResolutionDependencyNames {
from: self_name.clone(),
from: self_name.cloned(),
to: dependency_name.clone(),
};
let versions = ResolutionDependencyVersions {
from_version: self_version.clone(),
from_extra: self_extra.clone(),
from_dev: self_dev.clone(),
from_extra: self_extra.cloned(),
from_dev: self_dev.cloned(),
to_version: dependency_version.clone(),
to_extra: None,
to_dev: Some(dependency_dev.clone()),
@ -1756,7 +1759,7 @@ pub(crate) struct ResolutionPackage {
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
pub(crate) struct ResolutionDependencyNames {
pub(crate) from: PackageName,
pub(crate) from: Option<PackageName>,
pub(crate) to: PackageName,
}