Fix review items: Windows site-packages, dist-info version matching, extra marker regex, SetupCfgParser test coverage

Author: knutwannheden

rewrite-python/src/main/java/org/openrewrite/python/RequirementsTxtParser.java

@@ -47,6 +47,8 @@ public class RequirementsTxtParser implements Parser {
             "requirements(-[\\w-]+)?\\.(txt|in)"
     );
 
+    private static final Pattern EXTRA_MARKER_PATTERN = Pattern.compile("\\bextra\\s*==");
+
     private final PlainTextParser plainTextParser = new PlainTextParser();
 
     @Override
@@ -192,6 +194,12 @@ static List<ResolvedDependency> linkDependenciesFromMetadata(List<ResolvedDepend
     }
 
     private static @Nullable Path findSitePackages(Path workspace) {
+        // Windows: .venv/Lib/site-packages (no python* subdirectory)
+        Path windowsSitePackages = workspace.resolve(".venv/Lib/site-packages");
+        if (Files.isDirectory(windowsSitePackages)) {
+            return windowsSitePackages;
+        }
+        // Unix: .venv/lib/python*/site-packages
         Path lib = workspace.resolve(".venv/lib");
         if (!Files.isDirectory(lib)) {
             return null;
@@ -235,20 +243,20 @@ private static List<String> readRequiresDist(Path sitePackages, String packageNa
         if (Files.exists(direct)) {
             return direct;
         }
-        // Fallback: glob for matching dist-info directory
+        // Fallback: glob for matching dist-info directory (must also match version)
         try (DirectoryStream<Path> stream = Files.newDirectoryStream(sitePackages, "*.dist-info")) {
             String normalizedLower = PythonResolutionResult.normalizeName(packageName);
+            String expectedSuffix = "-" + version + ".dist-info";
             for (Path distInfo : stream) {
                 String dirName = distInfo.getFileName().toString();
-                // dirName is like "requests-2.31.0.dist-info"
-                int dashIdx = dirName.indexOf('-');
-                if (dashIdx > 0) {
-                    String dirPkgName = dirName.substring(0, dashIdx);
-                    if (PythonResolutionResult.normalizeName(dirPkgName).equals(normalizedLower)) {
-                        Path metadata = distInfo.resolve("METADATA");
-                        if (Files.exists(metadata)) {
-                            return metadata;
-                        }
+                if (!dirName.endsWith(expectedSuffix)) {
+                    continue;
+                }
+                String dirPkgName = dirName.substring(0, dirName.length() - expectedSuffix.length());
+                if (PythonResolutionResult.normalizeName(dirPkgName).equals(normalizedLower)) {
+                    Path metadata = distInfo.resolve("METADATA");
+                    if (Files.exists(metadata)) {
+                        return metadata;
                     }
                 }
             }
@@ -274,7 +282,7 @@ static List<String> parseRequiresDist(String metadataContent) {
             String value = trimmed.substring("Requires-Dist:".length()).trim();
 
             // Skip entries with "extra ==" markers (optional extras, not always installed)
-            if (value.contains("extra ==") || value.contains("extra=")) {
+            if (EXTRA_MARKER_PATTERN.matcher(value).find()) {
                 continue;
             }
 

rewrite-python/src/test/java/org/openrewrite/python/SetupCfgParserTest.java

@@ -16,10 +16,25 @@
 package org.openrewrite.python;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.openrewrite.InMemoryExecutionContext;
+import org.openrewrite.Parser;
+import org.openrewrite.SourceFile;
+import org.openrewrite.python.internal.UvExecutor;
+import org.openrewrite.python.marker.PythonResolutionResult;
+import org.openrewrite.python.marker.PythonResolutionResult.ResolvedDependency;
+import org.openrewrite.text.PlainText;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 class SetupCfgParserTest {
 
@@ -38,4 +53,40 @@ void builderCreatesDslName() {
         assertThat(builder.getDslName()).isEqualTo("setup.cfg");
         assertThat(builder.build()).isInstanceOf(SetupCfgParser.class);
     }
+
+    @Test
+    void markerContainsDependenciesFromFreeze(@TempDir Path tempDir) throws IOException {
+        assumeTrue(UvExecutor.findUvExecutable() != null, "uv is not installed");
+
+        Files.writeString(tempDir.resolve("setup.cfg"), """
+                [metadata]
+                name = myapp
+                version = 1.0.0
+
+                [options]
+                install_requires =
+                    requests>=2.28.0
+                """);
+        // setup.py is required for uv pip install to recognize the project
+        Files.writeString(tempDir.resolve("setup.py"), "from setuptools import setup; setup()");
+
+        SetupCfgParser parser = new SetupCfgParser();
+        Parser.Input input = Parser.Input.fromFile(tempDir.resolve("setup.cfg"));
+        List<SourceFile> parsed = parser.parseInputs(
+                Collections.singletonList(input),
+                tempDir,
+                new InMemoryExecutionContext(Throwable::printStackTrace)
+        ).collect(Collectors.toList());
+
+        assertThat(parsed).hasSize(1);
+        PlainText text = (PlainText) parsed.get(0);
+        PythonResolutionResult marker = text.getMarkers()
+                .findFirst(PythonResolutionResult.class).orElse(null);
+        assertThat(marker).isNotNull();
+
+        assertThat(marker.getResolvedDependencies()).isNotEmpty();
+        assertThat(marker.getResolvedDependencies().stream().map(ResolvedDependency::getName))
+                .contains("requests");
+        assertThat(marker.getPackageManager()).isEqualTo(PythonResolutionResult.PackageManager.Uv);
+    }
 }