From 34aba127e691bc5b55c7ba0cb84dffecbc8f69c2 Mon Sep 17 00:00:00 2001 From: Charlie Marsh Date: Wed, 5 Jun 2024 16:25:02 -0400 Subject: [PATCH] Add requires-python to test projects --- crates/uv/src/commands/project/lock.rs | 2 +- crates/uv/tests/lock_scenarios.rs | 7 +++++++ .../examples/bird-feeder/pyproject.toml | 1 + scripts/workspaces/albatross-in-example/pyproject.toml | 1 + scripts/workspaces/albatross-just-project/pyproject.toml | 1 + .../excluded/bird-feeder/pyproject.toml | 1 + .../albatross-project-in-excluded/pyproject.toml | 1 + .../packages/bird-feeder/pyproject.toml | 1 + .../albatross-root-workspace/packages/seeds/pyproject.toml | 1 + scripts/workspaces/albatross-root-workspace/pyproject.toml | 1 + .../packages/albatross/pyproject.toml | 1 + .../packages/bird-feeder/pyproject.toml | 1 + .../packages/seeds/pyproject.toml | 1 + 13 files changed, 19 insertions(+), 1 deletion(-) diff --git a/crates/uv/src/commands/project/lock.rs b/crates/uv/src/commands/project/lock.rs index a30d1000101a1..908e19c0db125 100644 --- a/crates/uv/src/commands/project/lock.rs +++ b/crates/uv/src/commands/project/lock.rs @@ -4,7 +4,7 @@ use std::borrow::Cow; use distribution_types::{IndexLocations, UnresolvedRequirementSpecification}; use install_wheel_rs::linker::LinkMode; -use pep440_rs::{Version, VersionSpecifier, VersionSpecifiers}; +use pep440_rs::{VersionSpecifier, VersionSpecifiers}; use uv_cache::Cache; use uv_client::RegistryClientBuilder; use uv_configuration::{ diff --git a/crates/uv/tests/lock_scenarios.rs b/crates/uv/tests/lock_scenarios.rs index 9fea023564ab1..cde9a5d635ffc 100644 --- a/crates/uv/tests/lock_scenarios.rs +++ b/crates/uv/tests/lock_scenarios.rs @@ -44,6 +44,7 @@ fn fork_basic() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-basic-a>=2; sys_platform == "linux"''', '''fork-basic-a<2; sys_platform == "darwin"''', @@ -151,6 +152,7 @@ fn fork_marker_accrue() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-marker-accrue-a==1.0.0; implementation_name == "cpython"''', '''fork-marker-accrue-b==1.0.0; implementation_name == "pypy"''', @@ -277,6 +279,7 @@ fn fork_marker_selection() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-marker-selection-a''', '''fork-marker-selection-b>=2; sys_platform == "linux"''', @@ -426,6 +429,7 @@ fn fork_marker_track() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-marker-track-a''', '''fork-marker-track-b>=2.8; sys_platform == "linux"''', @@ -575,6 +579,7 @@ fn fork_non_fork_marker_transitive() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-non-fork-marker-transitive-a==1.0.0''', '''fork-non-fork-marker-transitive-b==1.0.0''', @@ -698,6 +703,7 @@ fn fork_non_local_fork_marker_direct() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-non-local-fork-marker-direct-a==1.0.0; sys_platform == "linux"''', '''fork-non-local-fork-marker-direct-b==1.0.0; sys_platform == "darwin"''', @@ -771,6 +777,7 @@ fn fork_non_local_fork_marker_transitive() -> Result<()> { [project] name = "project" version = "0.1.0" + requires-python = ">=3.8" dependencies = [ '''fork-non-local-fork-marker-transitive-a==1.0.0''', '''fork-non-local-fork-marker-transitive-b==1.0.0''', diff --git a/scripts/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml b/scripts/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml index 0bb570bb3fb94..3caf10f0877d5 100644 --- a/scripts/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml +++ b/scripts/workspaces/albatross-in-example/examples/bird-feeder/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "bird-feeder" version = "1.0.0" +requires-python = ">=3.12" dependencies = ["anyio>=4.3.0,<5"] [build-system] diff --git a/scripts/workspaces/albatross-in-example/pyproject.toml b/scripts/workspaces/albatross-in-example/pyproject.toml index 9a61c9de0c1a2..5780cc8682035 100644 --- a/scripts/workspaces/albatross-in-example/pyproject.toml +++ b/scripts/workspaces/albatross-in-example/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "albatross" version = "0.1.0" +requires-python = ">=3.12" dependencies = ["tqdm>=4,<5"] [build-system] diff --git a/scripts/workspaces/albatross-just-project/pyproject.toml b/scripts/workspaces/albatross-just-project/pyproject.toml index 9a61c9de0c1a2..5780cc8682035 100644 --- a/scripts/workspaces/albatross-just-project/pyproject.toml +++ b/scripts/workspaces/albatross-just-project/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "albatross" version = "0.1.0" +requires-python = ">=3.12" dependencies = ["tqdm>=4,<5"] [build-system] diff --git a/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml b/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml index 0bb570bb3fb94..3caf10f0877d5 100644 --- a/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml +++ b/scripts/workspaces/albatross-project-in-excluded/excluded/bird-feeder/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "bird-feeder" version = "1.0.0" +requires-python = ">=3.12" dependencies = ["anyio>=4.3.0,<5"] [build-system] diff --git a/scripts/workspaces/albatross-project-in-excluded/pyproject.toml b/scripts/workspaces/albatross-project-in-excluded/pyproject.toml index de024d923c2f4..8a0702e25fd56 100644 --- a/scripts/workspaces/albatross-project-in-excluded/pyproject.toml +++ b/scripts/workspaces/albatross-project-in-excluded/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "albatross" version = "0.1.0" +requires-python = ">=3.12" dependencies = ["tqdm>=4,<5"] [tool.uv.workspace] diff --git a/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml b/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml index dc16cf9cb4f38..0d42072bea1d3 100644 --- a/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml +++ b/scripts/workspaces/albatross-root-workspace/packages/bird-feeder/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "bird-feeder" version = "1.0.0" +requires-python = ">=3.12" dependencies = ["anyio>=4.3.0,<5", "seeds"] [tool.uv.sources] diff --git a/scripts/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml b/scripts/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml index 4851f107879b8..f63b97736abc0 100644 --- a/scripts/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml +++ b/scripts/workspaces/albatross-root-workspace/packages/seeds/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "seeds" version = "1.0.0" +requires-python = ">=3.12" dependencies = ["idna==3.6"] [build-system] diff --git a/scripts/workspaces/albatross-root-workspace/pyproject.toml b/scripts/workspaces/albatross-root-workspace/pyproject.toml index 8dab9ce0a9455..3075d1bdc7102 100644 --- a/scripts/workspaces/albatross-root-workspace/pyproject.toml +++ b/scripts/workspaces/albatross-root-workspace/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "albatross" version = "0.1.0" +requires-python = ">=3.12" dependencies = ["bird-feeder", "tqdm>=4,<5"] [tool.uv.sources] diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml b/scripts/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml index 74fd3a1ebdaf5..757a4bf5c56c9 100644 --- a/scripts/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml +++ b/scripts/workspaces/albatross-virtual-workspace/packages/albatross/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "albatross" version = "0.1.0" +requires-python = ">=3.12" dependencies = ["bird-feeder", "tqdm>=4,<5"] [tool.uv.sources] diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml b/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml index dc16cf9cb4f38..0d42072bea1d3 100644 --- a/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml +++ b/scripts/workspaces/albatross-virtual-workspace/packages/bird-feeder/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "bird-feeder" version = "1.0.0" +requires-python = ">=3.12" dependencies = ["anyio>=4.3.0,<5", "seeds"] [tool.uv.sources] diff --git a/scripts/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml b/scripts/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml index 4851f107879b8..f63b97736abc0 100644 --- a/scripts/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml +++ b/scripts/workspaces/albatross-virtual-workspace/packages/seeds/pyproject.toml @@ -1,6 +1,7 @@ [project] name = "seeds" version = "1.0.0" +requires-python = ">=3.12" dependencies = ["idna==3.6"] [build-system]