From fb60cc1c7bb83c708a95b7d04b4f64d6f3ee8d01 Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Tue, 20 Aug 2024 14:10:45 -0400 Subject: [PATCH] uv/tests: another update to error messages Unlike the previous update, this message is specifically referring to a fork's markers inside the resolver. We probably *could* massage the message to be simplified with respect to requires-python, but it's not obvious to me that that is the right thing to do. --- crates/uv/tests/branching_urls.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/uv/tests/branching_urls.rs b/crates/uv/tests/branching_urls.rs index fceac2e19954..a1f3597515e5 100644 --- a/crates/uv/tests/branching_urls.rs +++ b/crates/uv/tests/branching_urls.rs @@ -67,7 +67,7 @@ fn branching_urls_overlapping() -> Result<()> { ----- stdout ----- ----- stderr ----- - error: Requirements contain conflicting URLs for package `iniconfig` in split `python_full_version < '3.12'`: + error: Requirements contain conflicting URLs for package `iniconfig` in split `python_full_version == '3.11.*'`: - https://files.pythonhosted.org/packages/9b/dd/b3c12c6d707058fa947864b67f0c4e0c39ef8610988d7baea9578f3c48f3/iniconfig-1.1.1-py2.py3-none-any.whl - https://files.pythonhosted.org/packages/ef/a6/62565a6e1cf69e10f5727360368e451d4b7f58beeac6173dc9db836a5b46/iniconfig-2.0.0-py3-none-any.whl "### @@ -723,7 +723,7 @@ fn branching_urls_of_different_sources_conflict() -> Result<()> { ----- stdout ----- ----- stderr ----- - error: Requirements contain conflicting URLs for package `iniconfig` in split `python_full_version < '3.12'`: + error: Requirements contain conflicting URLs for package `iniconfig` in split `python_full_version == '3.11.*'`: - git+https://github.com/pytest-dev/iniconfig@93f5930e668c0d1ddf4597e38dd0dea4e2665e7a - https://files.pythonhosted.org/packages/9b/dd/b3c12c6d707058fa947864b67f0c4e0c39ef8610988d7baea9578f3c48f3/iniconfig-1.1.1-py2.py3-none-any.whl "###