uv/tests: update snapshots from overlapping marker change

This commit is meant to group together test updates that are "uninteresting." That is, most updates are just adding marker expressions that are "always true" or establishing the forks in the lock file. I've tried to split out the interesting snapshot changes into subsequent commits. Some of the marker changes here are quite striking. I checked most of them. Every one I checked, including the big ones, are all just fancy ways of saying, "always true."
astral-sh · Aug 9, 2024 · 1aa62a1 · 1aa62a1
1 parent 462420f
commit 1aa62a1
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 141 deletions.
diff --git 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_version < '3.12' and python_version >= '3.11'`:
+    error: Requirements contain conflicting URLs for package `iniconfig` in split `python_version >= '3.11' and python_version < '3.12'`:
     - 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
     "###
@@ -678,7 +678,7 @@ fn branching_urls_of_different_sources_conflict() -> Result<()> {
     ----- stdout -----
 
     ----- stderr -----
-    error: Requirements contain conflicting URLs for package `iniconfig` in split `python_version < '3.12' and python_version >= '3.11'`:
+    error: Requirements contain conflicting URLs for package `iniconfig` in split `python_version >= '3.11' and python_version < '3.12'`:
     - 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
     "###

diff --git a/crates/uv/tests/edit.rs b/crates/uv/tests/edit.rs
@@ -1580,6 +1580,10 @@ fn update() -> Result<()> {
             lock, @r###"
         version = 1
         requires-python = ">=3.12"
+        environment-markers = [
+            "python_version <= '3.7'",
+            "python_version > '3.7'",
+        ]
 
         [options]
         exclude-newer = "2024-03-25 00:00:00 UTC"

diff --git a/crates/uv/tests/lock.rs b/crates/uv/tests/lock.rs
@@ -1308,6 +1308,10 @@ fn lock_dependency_extra() -> Result<()> {
                 lock, @r###"
             version = 1
             requires-python = ">=3.12"
+            environment-markers = [
+                "platform_system != 'Windows'",
+                "platform_system == 'Windows'",
+            ]
 
             [options]
             exclude-newer = "2024-03-25 00:00:00 UTC"
@@ -1407,6 +1411,7 @@ fn lock_dependency_extra() -> Result<()> {
             version = "0.1.0"
             source = { editable = "." }
             dependencies = [
+                { name = "flask" },
                 { name = "flask", extra = ["dotenv"] },
             ]
 
@@ -1787,6 +1792,10 @@ fn lock_dependency_non_existent_extra() -> Result<()> {
                 lock, @r###"
             version = 1
             requires-python = ">=3.12"
+            environment-markers = [
+                "platform_system != 'Windows'",
+                "platform_system == 'Windows'",
+            ]
 
             [options]
             exclude-newer = "2024-03-25 00:00:00 UTC"
@@ -2683,6 +2692,11 @@ fn lock_requires_python() -> Result<()> {
                 lock, @r###"
             version = 1
             requires-python = ">=3.7"
+            environment-markers = [
+                "python_version >= '3.11'",
+                "python_version < '3.8'",
+                "python_version >= '3.8' and python_version < '3.11'",
+            ]
 
             [options]
             exclude-newer = "2024-03-25 00:00:00 UTC"
@@ -2728,7 +2742,7 @@ fn lock_requires_python() -> Result<()> {
             source = { registry = "https://pypi.org/simple" }
             dependencies = [
                 { name = "typing-extensions", marker = "python_version < '3.8'" },
-                { name = "zipp" },
+                { name = "zipp", marker = "python_version < '3.8'" },
             ]
             sdist = { url = "https://files.pythonhosted.org/packages/a3/82/f6e29c8d5c098b6be61460371c2c5591f4a335923639edec43b3830650a4/importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4", size = 53569 }
             wheels = [
@@ -2834,6 +2848,11 @@ fn lock_requires_python() -> Result<()> {
                 lock, @r###"
             version = 1
             requires-python = ">=3.7.9"
+            environment-markers = [
+                "python_version < '3.8'",
+                "python_version >= '3.11'",
+                "python_version >= '3.8' and python_version < '3.11'",
+            ]
 
             [options]
             exclude-newer = "2024-03-25 00:00:00 UTC"
@@ -2879,7 +2898,7 @@ fn lock_requires_python() -> Result<()> {
             source = { registry = "https://pypi.org/simple" }
             dependencies = [
                 { name = "typing-extensions", marker = "python_version < '3.8'" },
-                { name = "zipp" },
+                { name = "zipp", marker = "python_version < '3.8'" },
             ]
             sdist = { url = "https://files.pythonhosted.org/packages/a3/82/f6e29c8d5c098b6be61460371c2c5591f4a335923639edec43b3830650a4/importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4", size = 53569 }
             wheels = [
@@ -3590,12 +3609,12 @@ fn lock_python_version_marker_complement() -> Result<()> {
             version = 1
             requires-python = ">=3.8"
             environment-markers = [
-                "python_full_version > '3.10' and python_version > '3.10'",
-                "python_full_version > '3.10' and python_version == '3.10'",
                 "python_full_version > '3.10' and python_version < '3.10'",
-                "python_full_version <= '3.10' and python_version > '3.10'",
-                "python_full_version <= '3.10' and python_version == '3.10'",
                 "python_full_version <= '3.10' and python_version < '3.10'",
+                "python_full_version > '3.10' and python_version == '3.10'",
+                "python_full_version > '3.10' and python_version > '3.10'",
+                "python_full_version <= '3.10' and python_version == '3.10'",
+                "python_full_version <= '3.10' and python_version > '3.10'",
             ]
 
             [options]
@@ -3851,6 +3870,10 @@ fn lock_multiple_markers() -> Result<()> {
                 lock, @r###"
             version = 1
             requires-python = ">=3.12"
+            environment-markers = [
+                "implementation_name != 'cpython'",
+                "implementation_name == 'cpython'",
+            ]
 
             [options]
             exclude-newer = "2024-03-25 00:00:00 UTC"