simplify logic assuming one sdist always per version

Author: chrisirhc

python/private/pypi/parse_requirements.bzl

@@ -207,65 +207,47 @@ def parse_requirements(
         # Return normalized names
         ret_requirements = ret.setdefault(normalize_name(whl_name), [])
 
-        # First, find if there's a common sdist across all platforms
-        common_sdist = None
-        common_sdist_hash = None
         all_platforms = []
+        common_sdist = None
+
         for r in sorted(reqs.values(), key = lambda r: r.requirement_line):
-            target_platforms = env_marker_target_platforms.get(r.requirement_line, r.target_platforms)
-            all_platforms.extend(target_platforms)
             whls, sdist = _add_dists(
                 requirement = r,
                 index_urls = index_urls.get(whl_name),
                 logger = logger,
             )
-            if sdist:
-                if not common_sdist:
-                    common_sdist = sdist
-                    common_sdist_hash = sdist.sha256
-                elif sdist.sha256 == common_sdist_hash:
-                    continue
-                else:
-                    common_sdist = None
-                    break
-
-        # If we found a common sdist, add it as a separate entry
+            
+            if sdist and not common_sdist:
+                common_sdist = sdist
+
+            target_platforms = env_marker_target_platforms.get(r.requirement_line, r.target_platforms)
+            all_platforms.extend(target_platforms)
+
+            ret_requirements.append(
+                struct(
+                    distribution = r.distribution,
+                    srcs = r.srcs,
+                    target_platforms = sorted(target_platforms),
+                    extra_pip_args = r.extra_pip_args,
+                    whls = whls,
+                    sdist = None,
+                    is_exposed = is_exposed,
+                ),
+            )
+        
         if common_sdist:
-            # Take the first requirement's info as base since version should be same
-            base_req = sorted(reqs.values(), key = lambda r: r.requirement_line)[0]
             ret_requirements.append(
                 struct(
-                    distribution = base_req.distribution,
-                    srcs = base_req.srcs,
+                    distribution = r.distribution,
+                    srcs = r.srcs,
                     target_platforms = sorted(all_platforms),
-                    extra_pip_args = base_req.extra_pip_args,
+                    extra_pip_args = r.extra_pip_args,
                     whls = [],
                     sdist = common_sdist,
                     is_exposed = is_exposed,
                 ),
             )
 
-        # Now add platform-specific entries with wheels
-        for r in sorted(reqs.values(), key = lambda r: r.requirement_line):
-            whls, sdist = _add_dists(
-                requirement = r,
-                index_urls = index_urls.get(whl_name),
-                logger = logger,
-            )
-            if not common_sdist or len(whls) > 0:  # Only add entries that have wheels
-                target_platforms = env_marker_target_platforms.get(r.requirement_line, r.target_platforms)
-                ret_requirements.append(
-                    struct(
-                        distribution = r.distribution,
-                        srcs = r.srcs,
-                        target_platforms = sorted(target_platforms),
-                        extra_pip_args = r.extra_pip_args,
-                        whls = whls,
-                        sdist = None if common_sdist else sdist,  # No sdist in wheel-specific entries
-                        is_exposed = is_exposed,
-                    ),
-                )
-
     if logger:
         logger.debug(lambda: "Will configure whl repos: {}".format(ret.keys()))
 

tests/pypi/parse_requirements/parse_requirements_tests.bzl

@@ -489,26 +489,6 @@ def _test_sdist_different_hashes(env):
     )
     env.expect.that_dict(got).contains_exactly({
         "foo": [
-            struct(
-                distribution = "foo",
-                extra_pip_args = [],
-                is_exposed = True,
-                sdist = struct(
-                    filename = "foo-0.0.1.tar.gz",
-                    url = "https://pypi.org/foo-0.0.1.tar.gz",
-                    sha256 = "cafebabe",
-                    yanked = False,
-                ),
-                srcs = struct(
-                    marker = "",
-                    requirement = "foo==0.0.1",
-                    requirement_line = "foo==0.0.1 --hash=sha256:deadbaaf --hash=sha256:cafebabe",
-                    shas = ["cafebabe", "deadbaaf"],
-                    version = "0.0.1",
-                ),
-                target_platforms = ["cp315_linux_x86_64", "cp315_windows_x86_64"],
-                whls = [],
-            ),
             struct(
                 distribution = "foo",
                 extra_pip_args = [],
@@ -553,6 +533,26 @@ def _test_sdist_different_hashes(env):
                     ),
                 ],
             ),
+            struct(
+                distribution = "foo",
+                extra_pip_args = [],
+                is_exposed = True,
+                sdist = struct(
+                    filename = "foo-0.0.1.tar.gz",
+                    url = "https://pypi.org/foo-0.0.1.tar.gz",
+                    sha256 = "cafebabe",
+                    yanked = False,
+                ),
+                srcs = struct(
+                    marker = "",
+                    requirement = "foo==0.0.1",
+                    requirement_line = "foo==0.0.1 --hash=sha256:deadbeef --hash=sha256:cafebabe",
+                    shas = ["cafebabe", "deadbeef"],
+                    version = "0.0.1",
+                ),
+                target_platforms = ["cp315_linux_x86_64", "cp315_windows_x86_64"],
+                whls = [],
+            ),
         ],
     })