From 9fa4fea8f24c6115366244fbc920fb091a1ad53a Mon Sep 17 00:00:00 2001 From: konsti Date: Tue, 29 Oct 2024 11:46:54 +0100 Subject: [PATCH] Fix tests on main (#8655) --- crates/uv/tests/it/edit.rs | 33 +++++++++++++++++++++++++++++++++ crates/uv/tests/it/lock.rs | 21 +++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/crates/uv/tests/it/edit.rs b/crates/uv/tests/it/edit.rs index 41165a5fd..4640ab6d9 100644 --- a/crates/uv/tests/it/edit.rs +++ b/crates/uv/tests/it/edit.rs @@ -6076,6 +6076,9 @@ fn add_index() -> Result<()> { version = "0.1.0" requires-python = ">=3.12" dependencies = [] + + [tool.uv] + constraint-dependencies = ["markupsafe<3"] "#})?; uv_snapshot!(context.filters(), context.add().arg("iniconfig==2.0.0").arg("--index").arg("https://pypi.org/simple").env_remove(EnvVars::UV_EXCLUDE_NEWER), @r###" @@ -6105,6 +6108,9 @@ fn add_index() -> Result<()> { "iniconfig==2.0.0", ] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [[tool.uv.index]] url = "https://pypi.org/simple" "### @@ -6121,6 +6127,9 @@ fn add_index() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "iniconfig" version = "2.0.0" @@ -6174,6 +6183,9 @@ fn add_index() -> Result<()> { "jinja2>=3.1.3", ] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [[tool.uv.index]] name = "pytorch" url = "https://download.pytorch.org/whl/cu121" @@ -6197,6 +6209,9 @@ fn add_index() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "iniconfig" version = "2.0.0" @@ -6275,6 +6290,9 @@ fn add_index() -> Result<()> { "jinja2>=3.1.3", ] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [tool.uv.sources] jinja2 = { index = "pytorch" } @@ -6298,6 +6316,9 @@ fn add_index() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "iniconfig" version = "2.0.0" @@ -6385,6 +6406,9 @@ fn add_index() -> Result<()> { "typing-extensions>=4.12.2", ] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [tool.uv.sources] jinja2 = { index = "pytorch" } @@ -6408,6 +6432,9 @@ fn add_index() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "iniconfig" version = "2.0.0" @@ -6504,6 +6531,9 @@ fn add_index() -> Result<()> { "typing-extensions>=4.12.2", ] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [tool.uv.sources] jinja2 = { index = "pytorch" } @@ -6527,6 +6557,9 @@ fn add_index() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "iniconfig" version = "2.0.0" diff --git a/crates/uv/tests/it/lock.rs b/crates/uv/tests/it/lock.rs index 01fc57d4e..5ea020f6f 100644 --- a/crates/uv/tests/it/lock.rs +++ b/crates/uv/tests/it/lock.rs @@ -13551,6 +13551,9 @@ fn lock_repeat_named_index_cli() -> Result<()> { requires-python = ">=3.12" dependencies = ["jinja2==3.1.2"] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [[tool.uv.index]] name = "pytorch" url = "https://download.pytorch.org/whl/cu121" @@ -13577,6 +13580,9 @@ fn lock_repeat_named_index_cli() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "jinja2" version = "3.1.2" @@ -13636,6 +13642,9 @@ fn lock_repeat_named_index_cli() -> Result<()> { version = 1 requires-python = ">=3.12" + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "jinja2" version = "3.1.2" @@ -16082,6 +16091,9 @@ fn lock_multiple_sources_index() -> Result<()> { requires-python = ">=3.12" dependencies = ["jinja2>=3"] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [tool.uv.sources] jinja2 = [ { index = "torch-cu118", marker = "sys_platform == 'win32'"}, @@ -16121,6 +16133,9 @@ fn lock_multiple_sources_index() -> Result<()> { "sys_platform != 'win32'", ] + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "jinja2" version = "3.1.3" @@ -16206,6 +16221,9 @@ fn lock_multiple_sources_index_mixed() -> Result<()> { requires-python = ">=3.12" dependencies = ["jinja2>=3"] + [tool.uv] + constraint-dependencies = ["markupsafe<3"] + [tool.uv.sources] jinja2 = [ { index = "torch-cu118", marker = "sys_platform == 'win32'"}, @@ -16241,6 +16259,9 @@ fn lock_multiple_sources_index_mixed() -> Result<()> { "sys_platform != 'win32'", ] + [manifest] + constraints = [{ name = "markupsafe", specifier = "<3" }] + [[package]] name = "jinja2" version = "3.1.3"