Skip to content

Fix: Ensure deterministic file ordering in iter_package_files #269

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

Merged
lorencarvalho merged 1 commit into from
Jan 10, 2026
Merged

Fix: Ensure deterministic file ordering in iter_package_files #269

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/shiv/builder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
# N.B.: `importlib.resources.{contents,is_resource,path}` are deprecated in 3.11 and gone in 3.13.
if sys.version_info < (3, 11):
def iter_package_files(package: Union[str, ModuleType]) -> Iterator[Tuple[Path, str]]:
for bootstrap_file in importlib_resources.contents(bootstrap):
for bootstrap_file in sorted(importlib_resources.contents(package)):
if importlib_resources.is_resource(bootstrap, bootstrap_file):
with importlib_resources.path(bootstrap, bootstrap_file) as path:
yield (path, bootstrap_file)
else:
def iter_package_files(package: Union[str, ModuleType]) -> Iterator[Tuple[Path, str]]:
for resource in importlib_resources.files(package).iterdir():
for resource in sorted(importlib_resources.files(package).iterdir(), key=lambda r: r.name):
if resource.is_file():
with importlib_resources.as_file(resource) as path:
yield (path, resource.name)
Expand Down