mirror of https://github.com/astral-sh/uv
Omit PEP 751 version for source trees (#13030)
## Summary This is a "MUST NOT" in the spec.
This commit is contained in:
parent
6130524585
commit
12bfbed0ec
|
|
@ -289,10 +289,15 @@ impl<'lock> PylockToml {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// "The version MUST NOT be included when it cannot be guaranteed to be consistent with the code used (i.e. when a source tree is used)."
|
||||||
|
let version = version
|
||||||
|
.as_ref()
|
||||||
|
.filter(|_| !matches!(&**dist, Dist::Source(SourceDist::Directory(..))));
|
||||||
|
|
||||||
// Create a `pylock.toml`-style package.
|
// Create a `pylock.toml`-style package.
|
||||||
let mut package = PylockTomlPackage {
|
let mut package = PylockTomlPackage {
|
||||||
name: dist.name().clone(),
|
name: dist.name().clone(),
|
||||||
version: version.clone(),
|
version: version.cloned(),
|
||||||
marker: node.marker.pep508(),
|
marker: node.marker.pep508(),
|
||||||
requires_python: None,
|
requires_python: None,
|
||||||
dependencies: vec![],
|
dependencies: vec![],
|
||||||
|
|
@ -737,9 +742,21 @@ impl<'lock> PylockToml {
|
||||||
.index(target.install_path())?
|
.index(target.install_path())?
|
||||||
.map(IndexUrl::into_url);
|
.map(IndexUrl::into_url);
|
||||||
|
|
||||||
|
// Extract the `packages.name` field.
|
||||||
|
let name = package.id.name.clone();
|
||||||
|
|
||||||
|
// Extract the `packages.version` field.
|
||||||
|
// "The version MUST NOT be included when it cannot be guaranteed to be consistent with the code used (i.e. when a source tree is used)."
|
||||||
|
let version = package
|
||||||
|
.id
|
||||||
|
.version
|
||||||
|
.as_ref()
|
||||||
|
.filter(|_| directory.is_none())
|
||||||
|
.cloned();
|
||||||
|
|
||||||
let package = PylockTomlPackage {
|
let package = PylockTomlPackage {
|
||||||
name: package.id.name.clone(),
|
name,
|
||||||
version: package.id.version.clone(),
|
version,
|
||||||
marker: node.marker,
|
marker: node.marker,
|
||||||
requires_python: None,
|
requires_python: None,
|
||||||
dependencies: vec![],
|
dependencies: vec![],
|
||||||
|
|
|
||||||
|
|
@ -3281,7 +3281,6 @@ fn pep_751_dependency() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3343,7 +3342,6 @@ fn pep_751_export_no_header() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3454,7 +3452,6 @@ fn pep_751_dependency_extra() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3515,7 +3512,6 @@ fn pep_751_project_extra() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3555,7 +3551,6 @@ fn pep_751_project_extra() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3595,7 +3590,6 @@ fn pep_751_project_extra() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3642,7 +3636,6 @@ fn pep_751_project_extra() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3689,7 +3682,6 @@ fn pep_751_project_extra() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -3995,7 +3987,6 @@ fn pep_751_infer_output_format() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
@ -4035,7 +4026,6 @@ fn pep_751_infer_output_format() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "project"
|
name = "project"
|
||||||
version = "0.1.0"
|
|
||||||
directory = { path = ".", editable = true }
|
directory = { path = ".", editable = true }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
|
||||||
|
|
@ -16420,7 +16420,6 @@ fn pep_751_compile_directory() -> Result<()> {
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
name = "foo"
|
name = "foo"
|
||||||
version = "1.0.0"
|
|
||||||
directory = { path = "foo" }
|
directory = { path = "foo" }
|
||||||
|
|
||||||
[[packages]]
|
[[packages]]
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue