fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
chrisirhc wants to merge 15 commits into from
Closed

fix: sdist resulting in duplicate repo name when requirements line does not match #2658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3a80e6a
add test scenario for sdists across platforms
chrisirhc Mar 11, 2025
5adac71
fix tests
chrisirhc Mar 11, 2025
7a30c1f
sketch for new merge logic
chrisirhc Mar 11, 2025
dc827aa
simplify logic assuming one sdist always per version
chrisirhc Mar 11, 2025
22cce79
unsure: address test failure
chrisirhc Mar 11, 2025
ddfecc4
fix merge
chrisirhc Apr 4, 2025
64f355c
use sha dictionary instead
chrisirhc Apr 4, 2025
16e0bc6
fix test
chrisirhc Apr 4, 2025
fa04ed5
attempt to make tests pass
chrisirhc Apr 4, 2025
c56d667
remove extraneous whitespace
chrisirhc Apr 4, 2025
4fc4b2a
remove platforms
chrisirhc Apr 4, 2025
d24c7aa
Revert "remove platforms"
chrisirhc Apr 4, 2025
6e98362
lint
chrisirhc Apr 4, 2025
ee995ad
clean up unused variables
chrisirhc Apr 4, 2025
6ed4173
lint
chrisirhc Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion python/private/pypi/parse_requirements.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
)

@aignasaignasMar 29, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.

@chrisirhcchrisirhcApr 4, 2025

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.

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,
srcs = r.srcs,
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,
),
)
Expand Down
4 changes: 2 additions & 2 deletions tests/pypi/extension/extension_tests.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),

@chrisirhcchrisirhcMar 11, 2025•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl

version = "3.15",
),
],
"pypi_315_simple_sdist_deadbeef": [
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",
),
],
Expand Down
119 changes: 119 additions & 0 deletions tests/pypi/parse_requirements/parse_requirements_tests.bzl
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
}

Expand DownExpand Up@@ -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.

Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix: sdist resulting in duplicate repo name when requirements line does not match#2658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

chrisirhc
wants to merge
15
commits into

from

 Closed


fix: sdist resulting in duplicate repo name when requirements line does not match
#2658
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


15 commits


Select commit
Hold shift + click to select a range
3a80e6a

add test scenario for sdists across platforms


chrisirhc Mar 11, 2025
5adac71

fix tests


chrisirhc Mar 11, 2025
7a30c1f

sketch for new merge logic


chrisirhc Mar 11, 2025
dc827aa

simplify logic assuming one sdist always per version


chrisirhc Mar 11, 2025
22cce79

unsure: address test failure


chrisirhc Mar 11, 2025
ddfecc4

fix merge


chrisirhc Apr 4, 2025
64f355c

use sha dictionary instead


chrisirhc Apr 4, 2025
16e0bc6

fix test


chrisirhc Apr 4, 2025
fa04ed5

attempt to make tests pass


chrisirhc Apr 4, 2025
c56d667

remove extraneous whitespace


chrisirhc Apr 4, 2025
4fc4b2a

remove platforms


chrisirhc Apr 4, 2025
d24c7aa

Revert "remove platforms"


chrisirhc Apr 4, 2025
6e98362

lint


chrisirhc Apr 4, 2025
ee995ad

clean up unused variables


chrisirhc Apr 4, 2025
6ed4173

lint


chrisirhc Apr 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


31 changes: 30 additions & 1 deletion
python/private/pypi/parse_requirements.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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(
Expand All@@ -215,14 +216,42 @@ def parse_requirements(
 )

@aignasaignasMar 29, 2025

Copy link


Copy Markdown

Collaborator
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The idea of adding a common sdist feels like a hack. Maybe having a different algorithm/grouping would be better. Maybe having per sha grouping could be better.
@chrisirhcchrisirhcApr 4, 2025

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a stab at changing it to use the sha instead.
 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,
 srcs = r.srcs,
 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,
 ),
 )
Expand Down

4 changes: 2 additions & 2 deletions
tests/pypi/extension/extension_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -701,15 +701,15 @@ 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"),
@chrisirhcchrisirhcMar 11, 2025•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure why my changes introduced this change. My guess is that extension.bzl may have some handling for any.whl
 version = "3.15",
 ),
 ],
 "pypi_315_simple_sdist_deadbeef": [
 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",
 ),
 ],
Expand Down

119 changes: 119 additions & 0 deletions
tests/pypi/parse_requirements/parse_requirements_tests.bzl

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
""",
 }

Expand DownExpand Up@@ -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.

Expand Down