Merge pull request #7738 from stealthycoin/clean-up-build-env

Remove unnecessary metadata from cli v2 distributable

Author: stealthycoin

backends/build_system/exe.py

@@ -51,6 +51,12 @@ def _update_metadata(self):
             self._final_dist_dir,
             distribution_source=DISTRIBUTION_SOURCE_EXE,
         )
+        for distinfo in self._utils.glob(
+                '**/*.dist-info',
+                root=self._final_dist_dir
+        ):
+            self._utils.rmtree(os.path.join(self._final_dist_dir, distinfo))
+
 
     def _ensure_no_existing_build_dir(self):
         if self._utils.isdir(self._dist_dir):

backends/build_system/utils.py

@@ -14,6 +14,7 @@
 import re
 import sys
 import shlex
+import glob
 import json
 import shutil
 import subprocess
@@ -226,6 +227,10 @@ def path_exists(self, path: str) -> bool:
     def rmtree(self, path: str) -> None:
         shutil.rmtree(path)
 
+    def glob(self, pattern: str, root: str, recursive=True):
+        with cd(root):
+            return glob.glob(pattern, recursive=recursive)
+
     def run(self, args: List[str], **kwargs: Dict[str, Any]):
         return subprocess.run(args, **kwargs)
 

scripts/installers/make-exe

@@ -13,7 +13,7 @@ from distutils.dir_util import copy_tree
 
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
-from utils import run, tmp_dir, update_metadata, save_to_zip
+from utils import run, tmp_dir, update_metadata, save_to_zip, remove_dist_info
 from install_deps import install_packages
 
 
@@ -50,6 +50,7 @@ def do_make_exe(workdir, exe_zipfile, ac_index):
                     distribution_source=DISTRIBUTION_SOURCE)
     copy_directory_contents_into(aws_complete_exe_build, output_exe_dist_dir)
     copy_directory_contents_into(ASSETS_DIR, exe_dir)
+    remove_dist_info(workdir)
     save_to_zip(workdir, exe_zipfile)
 
 

scripts/utils.py

@@ -7,6 +7,7 @@
 import subprocess
 import tempfile
 import zipfile
+import glob
 
 class BadRCError(Exception):
     pass
@@ -92,6 +93,13 @@ def update_metadata(dirname, **kwargs):
         json.dump(metadata, f)
 
 
+def remove_dist_info(dirname):
+    with cd(dirname):
+        for distinfo in glob.glob("**/*.dist-info", recursive=True):
+            path = os.path.join(dirname, distinfo)
+            shutil.rmtree(path)
+
+
 def save_to_zip(dirname, zipfile_name):
     if zipfile_name.endswith('.zip'):
         zipfile_name = zipfile_name[:-4]

tests/backends/build_system/integration/__init__.py

@@ -88,6 +88,13 @@ def assert_built_exe_is_correct(self, root_dir):
             "dist",
             "install",
         }
+        dist_dir = aws_dir / "dist"
+        dist_info_files = set(
+            f for f in os.listdir(dist_dir)
+            if '.dist-info' in f
+        )
+        assert dist_info_files == set(), \
+            f"Expected no dist-info files, found: {dist_info_files}"
 
         aws_exe = aws_dir / "dist" / "aws"
         self.assert_version_string_is_correct(aws_exe, "exe")

tests/backends/build_system/unit/test_exe.py

@@ -45,6 +45,10 @@ def update_metadata(self, dirname, **kwargs):
     def rmtree(self, path):
         self.calls.append(("rmtree", path))
 
+    def glob(self, pattern, root, recursive=True):
+        self.calls.append(('glob', pattern, root, recursive))
+        return []
+
 
 class FakeAwsCliVenv:
     @property
@@ -116,7 +120,12 @@ def _expected_build_tasks(self):
                 os.path.join("workspace", "aws", "dist"),
                 {"distribution_source": "source-exe"},
             ),
-
+            (
+                "glob",
+                "**/*.dist-info",
+                os.path.join("workspace", "aws", "dist"),
+                True
+            ),
         ]
 
     def test_build(self, fake_aws_cli_venv):