Skip to content

gh-134261: ZipFile - Don't rely on local time for reproducible builds & tests #134264

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
jaraco merged 9 commits into from
May 20, 2026
Merged

gh-134261: ZipFile - Don't rely on local time for reproducible builds & tests #134264

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4c389c9
gh-134261: Don't rely on local time for reproducible builds & tests
ctrlaltf2 May 19, 2025
e0fcc2d
📜🤖 Added by blurb_it.
blurb-it[bot] May 19, 2025
6fda35b
Merge branch 'main' into main
emmatyping May 27, 2025
f7c52b8
Materialize the expected value for the timestamp.
jaraco May 19, 2026
06f66b3
Correct stable timestamp.
jaraco May 19, 2026
5c09422
Seems a second gets lost during the zip file creation.
jaraco May 19, 2026
66499d3
Implement a proper timestamp comparison with tolerance.
jaraco May 19, 2026
d649130
Merge branch 'main' into ctrlaltf2/main
jaraco May 19, 2026
0f962dc
Nicer blurb message.
jaraco May 19, 2026
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
7 changes: 2 additions & 5 deletions Lib/test/test_zipfile/test_core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,11 +1812,8 @@ def test_write_with_source_date_epoch(self):

with zipfile.ZipFile(TESTFN, "r") as zf:
zip_info = zf.getinfo("test_source_date_epoch.txt")
get_time = time.localtime(int(os.environ['SOURCE_DATE_EPOCH']))[:6]
# Compare each element of the date_time tuple
# Allow for a 1-second difference
for z_time, g_time in zip(zip_info.date_time, get_time):
self.assertAlmostEqual(z_time, g_time, delta=1)
expected_utc = (1975, 7, 2, 22, 19, 59)
self.assertEqual(zip_info.date_time, expected_utc)

def test_write_without_source_date_epoch(self):
with os_helper.EnvironmentVarGuard() as env:
Expand Down
9 changes: 6 additions & 3 deletions Lib/zipfile/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -650,9 +650,12 @@ def _for_archive(self, archive):
Return self.
"""
# gh-91279: Set the SOURCE_DATE_EPOCH to a specific timestamp
epoch = os.environ.get('SOURCE_DATE_EPOCH')
get_time = int(epoch) if epoch else time.time()
self.date_time = time.localtime(get_time)[:6]
source_date_epoch = os.environ.get('SOURCE_DATE_EPOCH')

if source_date_epoch:
self.date_time = time.gmtime(int(source_date_epoch))[:6]
else:
self.date_time = time.localtime(time.time())[:6]

self.compress_type = archive.compression
self.compress_level = archive.compresslevel
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2025-05-19-21-08-25.gh-issue-134261.ravGYm.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
zip: On reproducible builds, ZipFile longer pulls in local environment timezone when writing file datetimes
Comment thread
jaraco marked this conversation as resolved.
Resolved
Loading