Skip to content

Omit PEP 751 version for source trees #13030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charliermarsh merged 1 commit into from
Apr 21, 2025
Merged

Omit PEP 751 version for source trees #13030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions crates/uv-resolver/src/lock/export/pylock_toml.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,15 @@ impl<'lock> PylockToml {
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.
let mut package = PylockTomlPackage {
name: dist.name().clone(),
version: version.clone(),
version: version.cloned(),
marker: node.marker.pep508(),
requires_python: None,
dependencies: vec![],
Expand Down Expand Up @@ -737,9 +742,21 @@ impl<'lock> PylockToml {
.index(target.install_path())?
.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 {
name: package.id.name.clone(),
version: package.id.version.clone(),
name,
version,
marker: node.marker,
requires_python: None,
dependencies: vec![],
Expand Down
10 changes: 0 additions & 10 deletions crates/uv/tests/it/export.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3281,7 +3281,6 @@ fn pep_751_dependency() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3343,7 +3342,6 @@ fn pep_751_export_no_header() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3454,7 +3452,6 @@ fn pep_751_dependency_extra() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3515,7 +3512,6 @@ fn pep_751_project_extra() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3555,7 +3551,6 @@ fn pep_751_project_extra() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3595,7 +3590,6 @@ fn pep_751_project_extra() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3642,7 +3636,6 @@ fn pep_751_project_extra() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3689,7 +3682,6 @@ fn pep_751_project_extra() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -3995,7 +3987,6 @@ fn pep_751_infer_output_format() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down Expand Up @@ -4035,7 +4026,6 @@ fn pep_751_infer_output_format() -> Result<()> {

[[packages]]
name = "project"
version = "0.1.0"
directory = { path = ".", editable = true }

[[packages]]
Expand Down
1 change: 0 additions & 1 deletion crates/uv/tests/it/pip_compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16420,7 +16420,6 @@ fn pep_751_compile_directory() -> Result<()> {

[[packages]]
name = "foo"
version = "1.0.0"
directory = { path = "foo" }

[[packages]]
Expand Down
Loading