build: use common function for compressing Python archive

Author: indygreg

build-linux.py

@@ -47,9 +47,8 @@ def bootstrap():
 
 
 def run():
-    import zstandard
     from pythonbuild.downloads import DOWNLOADS
-    from pythonbuild.utils import hash_path
+    from pythonbuild.utils import compress_python_archive
 
     now = datetime.datetime.utcnow()
 
@@ -66,18 +65,10 @@ def run():
     basename += '.tar'
 
     source_path = BUILD / basename
-    dest_path = DIST / ('cpython-%s-linux64%s-%s.tar.zst' % (
+    compress_python_archive(source_path, DIST, 'cpython-%s-linux64%s-%s' % (
         DOWNLOADS['cpython-3.7']['version'], extra,
         now.strftime('%Y%m%dT%H%M')))
 
-    print('compressing Python archive to %s' % dest_path)
-    with source_path.open('rb') as ifh, dest_path.open('wb') as ofh:
-        cctx = zstandard.ZstdCompressor(level=15)
-        cctx.copy_stream(ifh, ofh, source_path.stat().st_size)
-
-    sha256 = hash_path(dest_path)
-    print('%s has SHA256 %s' % (dest_path, sha256))
-
 
 if __name__ == '__main__':
     try:

build-macos.py

@@ -37,26 +37,18 @@ def bootstrap():
 
 
 def run():
-    import zstandard
     from pythonbuild.downloads import DOWNLOADS
-    from pythonbuild.utils import hash_path
+    from pythonbuild.utils import compress_python_archive
 
     now = datetime.datetime.utcnow()
 
     subprocess.run(['make'],
                    cwd=str(MAKE_DIR), check=True)
 
     source_path = BUILD / 'cpython-macos.tar'
-    dest_path = DIST / ('cpython-%s-macos-%s.tar.zst' % (
-        DOWNLOADS['cpython-3.7']['version'], now.strftime('%Y%m%dT%H%M')))
-
-    print('compressing Python archive to %s' % dest_path)
-    with source_path.open('rb') as ifh, dest_path.open('wb') as ofh:
-        cctx = zstandard.ZstdCompressor(level=15)
-        cctx.copy_stream(ifh, ofh, source_path.stat().st_size)
 
-    sha256 = hash_path(dest_path)
-    print('%s has SHA256 %s' % (dest_path, sha256))
+    compress_python_archive(source_path, DIST, 'cpython-%s-macos-%s' % (
+        DOWNLOADS['cpython-3.7']['version'], now.strftime('%Y%m%dT%H%M')))
 
 
 if __name__ == '__main__':

build-windows.py

@@ -37,9 +37,8 @@ def bootstrap():
 
 
 def run():
-    import zstandard
     from pythonbuild.downloads import DOWNLOADS
-    from pythonbuild.utils import hash_path
+    from pythonbuild.utils import compress_python_archive
 
     now = datetime.datetime.utcnow()
 
@@ -51,16 +50,9 @@ def run():
                    bufsize=0)
 
     source_path = BUILD / 'cpython-windows.tar'
-    dest_path = DIST / ('cpython-%s-windows-amd64-%s.tar.zst' % (
-        DOWNLOADS['cpython-3.7']['version'], now.strftime('%Y%m%dT%H%M')))
-
-    print('compressing Python archive to %s' % dest_path)
-    with source_path.open('rb') as ifh, dest_path.open('wb') as ofh:
-        cctx = zstandard.ZstdCompressor(level=15)
-        cctx.copy_stream(ifh, ofh, source_path.stat().st_size)
 
-    sha256 = hash_path(dest_path)
-    print('%s has SHA256 %s' % (dest_path, sha256))
+    compress_python_archive(source_path, DIST, 'cpython-%s-windows-amd64-%s' % (
+        DOWNLOADS['cpython-3.7']['version'], now.strftime('%Y%m%dT%H%M')))
 
 
 if __name__ == '__main__':

pythonbuild/utils.py

@@ -9,6 +9,8 @@
 import tarfile
 import urllib.request
 
+import zstandard
+
 from .downloads import (
     DOWNLOADS,
 )
@@ -132,3 +134,26 @@ def create_tar_from_directory(fh, base_path: pathlib.Path):
 def extract_tar_to_directory(source: pathlib.Path, dest: pathlib.Path):
     with tarfile.open(source, 'r') as tf:
         tf.extractall(dest)
+
+
+def compress_python_archive(source_path: pathlib.Path,
+                            dist_path: pathlib.Path,
+                            basename: str):
+    dest_path = dist_path / ('%s.tar.zst' % basename)
+    temp_path = dist_path / ('%s.tar.zst.tmp' % basename)
+
+    print('compressing Python archive to %s' % dest_path)
+
+    try:
+        with source_path.open('rb') as ifh, temp_path.open('wb') as ofh:
+            cctx = zstandard.ZstdCompressor(level=15)
+            cctx.copy_stream(ifh, ofh, source_path.stat().st_size)
+
+        temp_path.rename(dest_path)
+    except Exception:
+        temp_path.unlink()
+        raise
+
+    print('%s has SHA256 %s' % (dest_path, hash_path(dest_path)))
+
+    return dest_path