StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix non-deterministic python compilation" into main

Browse Source
This commit is contained in:
Anas Sulaiman
2024-02-01 22:30:18 +00:00
committed by Gerrit Code Review
parent f4ffe0a026 55b7ba0645
commit c219740e40
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
python/scripts/precompile_python.py
View File

@@ -16,6 +16,7 @@
import argparse import argparse
import py_compile import py_compile
import os import os
import sys
import shutil import shutil
import tempfile import tempfile
import zipfile import zipfile
@@ -23,22 +24,31 @@ import zipfile
# This file needs to support both python 2 and 3. # This file needs to support both python 2 and 3.
def process_one_file(name, inf, outzip): def process_one_file(info, infile, outzip):
if not name.endswith('.py'): if not info.filename.endswith('.py'):
outzip.writestr(name, inf.read()) outzip.writestr(info, infile.read())
return return
# Unfortunately py_compile requires the input/output files to be written # Unfortunately py_compile requires the input/output files to be written
# out to disk. # out to disk.
with tempfile.NamedTemporaryFile(prefix="Soong_precompile_", delete=False) as tmp: with tempfile.NamedTemporaryFile(prefix="Soong_precompile_", delete=False) as tmp:
shutil.copyfileobj(inf, tmp) shutil.copyfileobj(infile, tmp)
in_name = tmp.name in_name = tmp.name
with tempfile.NamedTemporaryFile(prefix="Soong_precompile_", delete=False) as tmp: with tempfile.NamedTemporaryFile(prefix="Soong_precompile_", delete=False) as tmp:
out_name = tmp.name out_name = tmp.name
try: try:
py_compile.compile(in_name, out_name, name, doraise=True) # Ensure deterministic pyc by using the hash rather than timestamp.
# This is required to improve caching in accelerated builds.
# Only works on Python 3.7+ (see https://docs.python.org/3/library/py_compile.html#py_compile.PycInvalidationMode)
# which should cover most updated branches and developer machines.
if sys.version_info >= (3, 7):
py_compile.compile(in_name, out_name, info.filename, doraise=True, invalidation_mode=py_compile.PycInvalidationMode.CHECKED_HASH)
else:
py_compile.compile(in_name, out_name, info.filename, doraise=True)
with open(out_name, 'rb') as f: with open(out_name, 'rb') as f:
outzip.writestr(name + 'c', f.read()) info.filename = info.filename + 'c'
# Use ZipInfo rather than str to reuse timestamps for deterministic zip files.
outzip.writestr(info, f.read())
finally: finally:
os.remove(in_name) os.remove(in_name)
os.remove(out_name) os.remove(out_name)
@@ -52,9 +62,9 @@ def main():
with open(args.dst_zip, 'wb') as outf, open(args.src_zip, 'rb') as inf: with open(args.dst_zip, 'wb') as outf, open(args.src_zip, 'rb') as inf:
with zipfile.ZipFile(outf, mode='w') as outzip, zipfile.ZipFile(inf, mode='r') as inzip: with zipfile.ZipFile(outf, mode='w') as outzip, zipfile.ZipFile(inf, mode='r') as inzip:
for name in inzip.namelist(): for info in inzip.infolist():
with inzip.open(name, mode='r') as inzipf: with inzip.open(info.filename, mode='r') as inzipf:
process_one_file(name, inzipf, outzip) process_one_file(info, inzipf, outzip)
if __name__ == "__main__": if __name__ == "__main__":