diff --git a/python/private/pypi/parse_requirements.bzl b/python/private/pypi/parse_requirements.bzl index 3280ce8df1..c979f68d41 100644 --- a/python/private/pypi/parse_requirements.bzl +++ b/python/private/pypi/parse_requirements.bzl @@ -206,6 +206,7 @@ def parse_requirements( # Return normalized names ret_requirements = ret.setdefault(normalize_name(whl_name), []) + sdists_by_sha = {} for r in sorted(reqs.values(), key = lambda r: r.requirement_line): whls, sdist = _add_dists( @@ -215,6 +216,21 @@ def parse_requirements( ) target_platforms = env_marker_target_platforms.get(r.requirement_line, r.target_platforms) + + if sdist: + sha = sdist.sha256 + sdist_info = sdists_by_sha.setdefault(sha, struct( + distribution = r.distribution, + srcs = r.srcs, + extra_pip_args = r.extra_pip_args, + sdist = sdist, + platforms = [], + )) + sdist_info.platforms.extend(target_platforms) + + if len(whls) == 0: + continue + ret_requirements.append( struct( distribution = r.distribution, @@ -222,7 +238,20 @@ def parse_requirements( target_platforms = sorted(target_platforms), extra_pip_args = r.extra_pip_args, whls = whls, - sdist = sdist, + sdist = None, + is_exposed = is_exposed, + ), + ) + + for sdist_info in sdists_by_sha.values(): + ret_requirements.append( + struct( + distribution = sdist_info.distribution, + srcs = sdist_info.srcs, + target_platforms = sorted(sdist_info.platforms), + extra_pip_args = sdist_info.extra_pip_args, + whls = [], + sdist = sdist_info.sdist, is_exposed = is_exposed, ), ) diff --git a/tests/pypi/extension/extension_tests.bzl b/tests/pypi/extension/extension_tests.bzl index 3a91c7b108..1fe246416e 100644 --- a/tests/pypi/extension/extension_tests.bzl +++ b/tests/pypi/extension/extension_tests.bzl @@ -701,7 +701,7 @@ pip_fallback==0.0.1 struct( config_setting = None, filename = "simple-0.0.1-py3-none-any.whl", - target_platforms = None, + target_platforms = ("cp315_linux_aarch64", "cp315_linux_arm", "cp315_linux_ppc", "cp315_linux_s390x", "cp315_linux_x86_64", "cp315_osx_aarch64", "cp315_osx_x86_64", "cp315_windows_x86_64"), version = "3.15", ), ], @@ -709,7 +709,7 @@ pip_fallback==0.0.1 struct( config_setting = None, filename = "simple-0.0.1.tar.gz", - target_platforms = None, + target_platforms = ("cp315_linux_aarch64", "cp315_linux_arm", "cp315_linux_ppc", "cp315_linux_s390x", "cp315_linux_x86_64", "cp315_osx_aarch64", "cp315_osx_x86_64", "cp315_windows_x86_64"), version = "3.15", ), ], diff --git a/tests/pypi/parse_requirements/parse_requirements_tests.bzl b/tests/pypi/parse_requirements/parse_requirements_tests.bzl index c50482127b..1dcc3265ec 100644 --- a/tests/pypi/parse_requirements/parse_requirements_tests.bzl +++ b/tests/pypi/parse_requirements/parse_requirements_tests.bzl @@ -80,6 +80,12 @@ foo==0.0.3 --hash=sha256:deadbaaf "requirements_windows": """\ foo[extra]==0.0.2 --hash=sha256:deadbeef bar==0.0.1 --hash=sha256:deadb00f +""", + "requirements_sdist_different_hashes": """\ +foo==0.0.1 --hash=sha256:deadbeef --hash=sha256:cafebabe +""", + "requirements_sdist_different_hashes_linux": """\ +foo==0.0.1 --hash=sha256:deadbaaf --hash=sha256:cafebabe """, } @@ -623,6 +629,119 @@ def _test_optional_hash(env): _tests.append(_test_optional_hash) +def _test_sdist_different_hashes(env): + """Test that sdists with same hash but wheels with different hashes across platforms are handled correctly.""" + + def _mock_get_index_urls(_, distributions): + return { + "foo": struct( + whls = { + "deadbeef": struct( + filename = "foo-0.0.1-py3-none-win_amd64.whl", + url = "https://pypi.org/foo-0.0.1-win.whl", + sha256 = "deadbeef", + yanked = False, + ), + "deadbaaf": struct( + filename = "foo-0.0.1-py3-none-manylinux_2_17_x86_64.whl", + url = "https://pypi.org/foo-0.0.1-linux.whl", + sha256 = "deadbaaf", + yanked = False, + ), + }, + sdists = { + "cafebabe": struct( + filename = "foo-0.0.1.tar.gz", + url = "https://pypi.org/foo-0.0.1.tar.gz", + sha256 = "cafebabe", + yanked = False, + ), + }, + ), + } + + got = parse_requirements( + ctx = _mock_ctx(), + requirements_by_platform = { + "requirements_sdist_different_hashes": ["cp315_windows_x86_64"], + "requirements_sdist_different_hashes_linux": ["cp315_linux_x86_64"], + }, + get_index_urls = _mock_get_index_urls, + ) + env.expect.that_dict(got).contains_exactly({ + "foo": [ + struct( + distribution = "foo", + extra_pip_args = [], + is_exposed = True, + sdist = None, + srcs = struct( + marker = "", + requirement = "foo==0.0.1", + requirement_line = "foo==0.0.1 --hash=sha256:deadbaaf --hash=sha256:cafebabe", + shas = ["cafebabe", "deadbaaf"], + url = "", + version = "0.0.1", + ), + target_platforms = ["cp315_linux_x86_64"], + whls = [ + struct( + filename = "foo-0.0.1-py3-none-manylinux_2_17_x86_64.whl", + url = "https://pypi.org/foo-0.0.1-linux.whl", + sha256 = "deadbaaf", + yanked = False, + ), + ], + ), + struct( + distribution = "foo", + extra_pip_args = [], + is_exposed = True, + sdist = None, + srcs = struct( + marker = "", + requirement = "foo==0.0.1", + requirement_line = "foo==0.0.1 --hash=sha256:deadbeef --hash=sha256:cafebabe", + shas = ["cafebabe", "deadbeef"], + url = "", + version = "0.0.1", + ), + target_platforms = ["cp315_windows_x86_64"], + whls = [ + struct( + filename = "foo-0.0.1-py3-none-win_amd64.whl", + url = "https://pypi.org/foo-0.0.1-win.whl", + sha256 = "deadbeef", + yanked = False, + ), + ], + ), + 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"], + url = "", + version = "0.0.1", + ), + target_platforms = ["cp315_linux_x86_64", "cp315_windows_x86_64"], + whls = [], + ), + ], + }) + +_tests.append(_test_sdist_different_hashes) + def parse_requirements_test_suite(name): """Create the test suite.