Skip to content

Use dev-dependencies and requires-dev for lockfile compatibility #8501

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
merged 1 commit into from
Oct 23, 2024
Merged

Use dev-dependencies and requires-dev for lockfile compatibility #8501

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
8 changes: 4 additions & 4 deletions crates/uv-resolver/src/lock/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2043,7 +2043,7 @@ impl Package {
}
}
if !dependency_groups.is_empty() {
table.insert("dependency-groups", Item::Table(dependency_groups));
table.insert("dev-dependencies", Item::Table(dependency_groups));
}
}

Expand Down Expand Up @@ -2108,7 +2108,7 @@ impl Package {
}
}
if !dependency_groups.is_empty() {
metadata_table.insert("dependency-groups", Item::Table(dependency_groups));
metadata_table.insert("requires-dev", Item::Table(dependency_groups));
}
}

Expand Down Expand Up @@ -2218,7 +2218,7 @@ struct PackageWire {
dependencies: Vec<DependencyWire>,
#[serde(default)]
optional_dependencies: BTreeMap<ExtraName, Vec<DependencyWire>>,
#[serde(default, alias = "dev-dependencies")]
#[serde(default, rename = "dev-dependencies")]
dependency_groups: BTreeMap<GroupName, Vec<DependencyWire>>,
}

Expand All @@ -2227,7 +2227,7 @@ struct PackageWire {
struct PackageMetadata {
#[serde(default)]
requires_dist: BTreeSet<Requirement>,
#[serde(default, alias = "requires-dev")]
#[serde(default, rename = "requires-dev")]
dependency_groups: BTreeMap<GroupName, BTreeSet<Requirement>>,
}

Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/edit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,14 +1074,14 @@ fn add_remove_dev() -> Result<()> {
version = "0.1.0"
source = { editable = "." }

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "anyio" },
]

[package.metadata]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "anyio", specifier = "==3.7.0" }]

[[package]]
Expand Down
38 changes: 19 additions & 19 deletions crates/uv/tests/it/lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4541,15 +4541,15 @@ fn lock_dev() -> Result<()> {
{ name = "iniconfig" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "typing-extensions" },
]

[package.metadata]
requires-dist = [{ name = "iniconfig" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "typing-extensions", url = "https://files.pythonhosted.org/packages/26/9f/ad63fc0248c5379346306f8668cda6e2e2e9c95e01216d2b8ffd9ff037d0/typing_extensions-4.12.2-py3-none-any.whl" }]

[[package]]
Expand Down Expand Up @@ -6153,14 +6153,14 @@ fn lock_dev_transitive() -> Result<()> {
version = "0.1.0"
source = { editable = "baz" }

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "typing-extensions" },
]

[package.metadata]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "typing-extensions", specifier = ">4" }]

[[package]]
Expand All @@ -6170,7 +6170,7 @@ fn lock_dev_transitive() -> Result<()> {

[package.metadata]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "anyio" }]

[[package]]
Expand Down Expand Up @@ -7077,15 +7077,15 @@ fn lock_no_sources() -> Result<()> {
{ name = "anyio" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "typing-extensions" },
]

[package.metadata]
requires-dist = [{ name = "anyio", directory = "anyio" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "typing-extensions", specifier = ">4" }]

[[package]]
Expand Down Expand Up @@ -7167,15 +7167,15 @@ fn lock_no_sources() -> Result<()> {
{ name = "anyio" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "typing-extensions" },
]

[package.metadata]
requires-dist = [{ name = "anyio" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "typing-extensions", specifier = ">4" }]

[[package]]
Expand Down Expand Up @@ -11017,15 +11017,15 @@ fn lock_dev_dependencies_alias() -> Result<()> {
{ name = "typing-extensions" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "iniconfig" },
]

[package.metadata]
requires-dist = [{ name = "typing-extensions" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "iniconfig" }]

[[package]]
Expand Down Expand Up @@ -12412,14 +12412,14 @@ fn lock_dropped_dev_extra() -> Result<()> {
version = "0.1.0"
source = { editable = "." }

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "coverage" },
]

[package.metadata]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "coverage", extras = ["toml"] }]
"###
);
Expand Down Expand Up @@ -13382,15 +13382,15 @@ fn lock_explicit_virtual_project() -> Result<()> {
{ name = "black" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "anyio" },
]

[package.metadata]
requires-dist = [{ name = "black" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "anyio" }]

[[package]]
Expand Down Expand Up @@ -13599,15 +13599,15 @@ fn lock_implicit_virtual_project() -> Result<()> {
{ name = "black" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "anyio" },
]

[package.metadata]
requires-dist = [{ name = "black" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [{ name = "anyio" }]

[[package]]
Expand Down Expand Up @@ -16327,7 +16327,7 @@ fn lock_group_include() -> Result<()> {
{ name = "typing-extensions" },
]

[package.dependency-groups]
[package.dev-dependencies]
bar = [
{ name = "trio" },
]
Expand All @@ -16339,7 +16339,7 @@ fn lock_group_include() -> Result<()> {
[package.metadata]
requires-dist = [{ name = "typing-extensions" }]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
bar = [{ name = "trio" }]
foo = [
{ name = "anyio" },
Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/snapshots/it__ecosystem__github-wikidata-bot-lock-file.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ dependencies = [
{ name = "yarl" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "httpx" },
{ name = "pytest" },
Expand All @@ -135,7 +135,7 @@ requires-dist = [
{ name = "yarl", specifier = ">=1.9,<2" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "httpx", specifier = ">=0.27.0,<0.28" },
{ name = "pytest", specifier = ">=8.0.0,<9" },
Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/snapshots/it__ecosystem__packse-lock-file.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ serve = [
{ name = "watchfiles" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "psutil" },
{ name = "pytest" },
Expand All @@ -352,7 +352,7 @@ requires-dist = [
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/snapshots/it__ecosystem__warehouse-lock-file.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3889,7 +3889,7 @@ deploy = [
{ name = "gunicorn" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "asyncudp" },
{ name = "black" },
Expand Down Expand Up @@ -4033,7 +4033,7 @@ requires-dist = [
{ name = "zxcvbn" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "asyncudp", specifier = ">=0.7" },
{ name = "black", specifier = "==24.4.2" },
Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/snapshots/it__workflow__packse_add_remove_existing_package_noop-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ serve = [
{ name = "watchfiles" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "psutil" },
{ name = "pytest" },
Expand All @@ -348,7 +348,7 @@ requires-dist = [
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down
4 changes: 2 additions & 2 deletions crates/uv/tests/it/snapshots/it__workflow__packse_add_remove_one_package-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ serve = [
{ name = "watchfiles" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "psutil" },
{ name = "pytest" },
Expand All @@ -348,7 +348,7 @@ requires-dist = [
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down
4 changes: 2 additions & 2 deletions ...v/tests/it/snapshots/it__workflow__packse_promote_transitive_to_direct_then_remove-2.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ serve = [
{ name = "watchfiles" },
]

[package.dependency-groups]
[package.dev-dependencies]
dev = [
{ name = "psutil" },
{ name = "pytest" },
Expand All @@ -348,7 +348,7 @@ requires-dist = [
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down
8 changes: 4 additions & 4 deletions crates/uv/tests/it/workflow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn packse_add_remove_one_package() {
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down Expand Up @@ -160,7 +160,7 @@ fn packse_add_remove_one_package() {
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down Expand Up @@ -315,7 +315,7 @@ fn packse_promote_transitive_to_direct_then_remove() {
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down Expand Up @@ -373,7 +373,7 @@ fn packse_promote_transitive_to_direct_then_remove() {
{ name = "watchfiles", marker = "extra == 'serve'", specifier = ">=0.21.0" },
]

[package.metadata.dependency-groups]
[package.metadata.requires-dev]
dev = [
{ name = "psutil", specifier = ">=5.9.7" },
{ name = "pytest", specifier = ">=7.4.3" },
Expand Down
Loading