Avoid infinite loop in uv export with conflicts

Author: charliermarsh

crates/uv-resolver/src/lock/requirements_txt.rs

@@ -284,13 +284,17 @@ impl<'lock> RequirementsTxtExport<'lock> {
             }
         }
 
+        println!("1");
+
         // Determine the reachability of each node in the graph.
         let mut reachability = if let Some(conflicts) = conflicts.as_ref() {
             conflict_marker_reachability(&graph, &[], conflicts)
         } else {
             marker_reachability(&graph, &[])
         };
 
+        println!("2");
+
         // Collect all packages.
         let mut nodes = graph
             .node_references()
@@ -496,8 +500,6 @@ fn conflict_marker_reachability<'lock>(
                     queue.push(child_edge.target());
                 }
             }
-
-            queue.push(child_edge.target());
         }
     }
 

crates/uv/tests/it/export.rs

@@ -2982,3 +2982,193 @@ fn complex_conflict_markers() -> Result<()> {
 
     Ok(())
 }
+
+/// Export requirements in the presence of a cycle.
+#[test]
+fn cyclic_dependencies() -> Result<()> {
+    let context = TestContext::new("3.12");
+
+    let pyproject_toml = context.temp_dir.child("pyproject.toml");
+    pyproject_toml.write_str(
+        r#"
+        [project]
+        name = "project"
+        version = "0.1.0"
+        requires-python = ">=3.12"
+        dependencies = [
+            "testtools==2.3.0",
+            "fixtures==3.0.0",
+        ]
+        "#,
+    )?;
+
+    context.lock().assert().success();
+
+    uv_snapshot!(context.filters(), context.export(), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    1
+    2
+    # This file was autogenerated by uv via the following command:
+    #    uv export --cache-dir [CACHE_DIR]
+    argparse==1.4.0 \
+        --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \
+        --hash=sha256:c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314
+        # via unittest2
+    extras==1.0.0 \
+        --hash=sha256:132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e \
+        --hash=sha256:f689f08df47e2decf76aa6208c081306e7bd472630eb1ec8a875c67de2366e87
+        # via testtools
+    fixtures==3.0.0 \
+        --hash=sha256:2a551b0421101de112d9497fb5f6fd25e5019391c0fbec9bad591ecae981420d \
+        --hash=sha256:fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef
+        # via
+        #   project
+        #   testtools
+    linecache2==1.0.0 \
+        --hash=sha256:4b26ff4e7110db76eeb6f5a7b64a82623839d595c2038eeda662f2a2db78e97c \
+        --hash=sha256:e78be9c0a0dfcbac712fe04fbf92b96cddae80b1b842f24248214c8496f006ef
+        # via traceback2
+    pbr==6.0.0 \
+        --hash=sha256:4a7317d5e3b17a3dccb6a8cfe67dab65b20551404c52c8ed41279fa4f0cb4cda \
+        --hash=sha256:d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9
+        # via
+        #   fixtures
+        #   testtools
+    python-mimeparse==1.6.0 \
+        --hash=sha256:76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 \
+        --hash=sha256:a295f03ff20341491bfe4717a39cd0a8cc9afad619ba44b77e86b0ab8a2b8282
+        # via testtools
+    six==1.16.0 \
+        --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
+        --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+        # via
+        #   fixtures
+        #   testtools
+        #   unittest2
+    testtools==2.3.0 \
+        --hash=sha256:5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559 \
+        --hash=sha256:a2be448869171b6e0f26d9544088b8b98439ec180ce272040236d570a40bcbed
+        # via
+        #   fixtures
+        #   project
+    traceback2==1.4.0 \
+        --hash=sha256:05acc67a09980c2ecfedd3423f7ae0104839eccb55fc645773e1caa0951c3030 \
+        --hash=sha256:8253cebec4b19094d67cc5ed5af99bf1dba1285292226e98a31929f87a5d6b23
+        # via
+        #   testtools
+        #   unittest2
+    unittest2==1.1.0 \
+        --hash=sha256:13f77d0875db6d9b435e1d4f41e74ad4cc2eb6e1d5c824996092b3430f088bb8 \
+        --hash=sha256:22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579
+        # via testtools
+
+    ----- stderr -----
+    Resolved 11 packages in [TIME]
+    ");
+
+    Ok(())
+}
+
+/// Export requirements in the presence of a cycle, with conflicts enabled.
+#[test]
+fn cyclic_dependencies_conflict() -> Result<()> {
+    let context = TestContext::new("3.12");
+
+    let pyproject_toml = context.temp_dir.child("pyproject.toml");
+    pyproject_toml.write_str(
+        r#"
+        [project]
+        name = "project"
+        version = "0.1.0"
+        requires-python = ">=3.12"
+        dependencies = [
+            "testtools==2.3.0",
+            "fixtures==3.0.0",
+        ]
+
+        [project.optional-dependencies]
+        cpu = ["anyio==3.0.0"]
+        gpu = ["anyio==4.0.0"]
+
+        [tool.uv]
+        package = false
+        conflicts = [
+          [
+            { extra = "cpu" },
+            { extra = "gpu" },
+          ],
+        ]
+
+        "#,
+    )?;
+
+    context.lock().assert().success();
+
+    uv_snapshot!(context.filters(), context.export(), @r"
+    success: true
+    exit_code: 0
+    ----- stdout -----
+    1
+    2
+    # This file was autogenerated by uv via the following command:
+    #    uv export --cache-dir [CACHE_DIR]
+    argparse==1.4.0 \
+        --hash=sha256:62b089a55be1d8949cd2bc7e0df0bddb9e028faefc8c32038cc84862aefdd6e4 \
+        --hash=sha256:c31647edb69fd3d465a847ea3157d37bed1f95f19760b11a47aa91c04b666314
+        # via unittest2
+    extras==1.0.0 \
+        --hash=sha256:132e36de10b9c91d5d4cc620160a476e0468a88f16c9431817a6729611a81b4e \
+        --hash=sha256:f689f08df47e2decf76aa6208c081306e7bd472630eb1ec8a875c67de2366e87
+        # via testtools
+    fixtures==3.0.0 \
+        --hash=sha256:2a551b0421101de112d9497fb5f6fd25e5019391c0fbec9bad591ecae981420d \
+        --hash=sha256:fcf0d60234f1544da717a9738325812de1f42c2fa085e2d9252d8fff5712b2ef
+        # via
+        #   project
+        #   testtools
+    linecache2==1.0.0 \
+        --hash=sha256:4b26ff4e7110db76eeb6f5a7b64a82623839d595c2038eeda662f2a2db78e97c \
+        --hash=sha256:e78be9c0a0dfcbac712fe04fbf92b96cddae80b1b842f24248214c8496f006ef
+        # via traceback2
+    pbr==6.0.0 \
+        --hash=sha256:4a7317d5e3b17a3dccb6a8cfe67dab65b20551404c52c8ed41279fa4f0cb4cda \
+        --hash=sha256:d1377122a5a00e2f940ee482999518efe16d745d423a670c27773dfbc3c9a7d9
+        # via
+        #   fixtures
+        #   testtools
+    python-mimeparse==1.6.0 \
+        --hash=sha256:76e4b03d700a641fd7761d3cd4fdbbdcd787eade1ebfac43f877016328334f78 \
+        --hash=sha256:a295f03ff20341491bfe4717a39cd0a8cc9afad619ba44b77e86b0ab8a2b8282
+        # via testtools
+    six==1.16.0 \
+        --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \
+        --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254
+        # via
+        #   fixtures
+        #   testtools
+        #   unittest2
+    testtools==2.3.0 \
+        --hash=sha256:5827ec6cf8233e0f29f51025addd713ca010061204fdea77484a2934690a0559 \
+        --hash=sha256:a2be448869171b6e0f26d9544088b8b98439ec180ce272040236d570a40bcbed
+        # via
+        #   fixtures
+        #   project
+    traceback2==1.4.0 \
+        --hash=sha256:05acc67a09980c2ecfedd3423f7ae0104839eccb55fc645773e1caa0951c3030 \
+        --hash=sha256:8253cebec4b19094d67cc5ed5af99bf1dba1285292226e98a31929f87a5d6b23
+        # via
+        #   testtools
+        #   unittest2
+    unittest2==1.1.0 \
+        --hash=sha256:13f77d0875db6d9b435e1d4f41e74ad4cc2eb6e1d5c824996092b3430f088bb8 \
+        --hash=sha256:22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579
+        # via testtools
+
+    ----- stderr -----
+    Resolved 15 packages in [TIME]
+    ");
+
+    Ok(())
+}