Use same base temp dir for easier debugging

Author: levsa

generate_upstream.py

@@ -6,6 +6,7 @@
 import tempfile
 import zipfile
 from pathlib import Path
+from tempfile import mkdtemp
 from typing import List, Set, Tuple
 
 from libcst import MetadataWrapper, parse_module
@@ -40,26 +41,26 @@ def download_stubs(download_folder: Path, file_filter: List[str]) -> None:
     )
 
     # Extract the upstream pyi files
-    with tempfile.TemporaryDirectory() as temp_folder_str:
-        temp_folder = Path(temp_folder_str)
-        print(f"Created temporary directory {temp_folder}")
-        for download in download_folder.glob("*.whl"):
-            print(f"Extracting file {download}")
-            with zipfile.ZipFile(download, "r") as zip_ref:
-                zip_ref.extractall(temp_folder)
-
-        # Take every pyi file from all folders and move it to "PyQt6-stubs"
-        for folder in temp_folder.glob("*"):
-            print(f"Scanning folder for pyi files {folder}")
-            for extracted_file in folder.glob("*.pyi"):
-                if file_filter and extracted_file.stem not in file_filter:
-                    print(f"Skipping file: {extracted_file}")
-                    continue
-                copy_file = SRC_DIR / extracted_file.name
-                shutil.copyfile(extracted_file, copy_file)
-                subprocess.check_call(["git", "add", str(copy_file)])
-
-        add_uic_stubs(temp_folder)
+    temp_folder_str = mkdtemp(dir=download_folder)
+    temp_folder = Path(temp_folder_str)
+    print(f"Created temporary directory {temp_folder}")
+    for download in download_folder.glob("*.whl"):
+        print(f"Extracting file {download}")
+        with zipfile.ZipFile(download, "r") as zip_ref:
+            zip_ref.extractall(temp_folder)
+
+    # Take every pyi file from all folders and move it to "PyQt6-stubs"
+    for folder in temp_folder.glob("*"):
+        print(f"Scanning folder for pyi files {folder}")
+        for extracted_file in folder.glob("*.pyi"):
+            if file_filter and extracted_file.stem not in file_filter:
+                print(f"Skipping file: {extracted_file}")
+                continue
+            copy_file = SRC_DIR / extracted_file.name
+            shutil.copyfile(extracted_file, copy_file)
+            subprocess.check_call(["git", "add", str(copy_file)])
+
+    add_uic_stubs(temp_folder)
 
 
 def add_uic_stubs(temp_folder: Path) -> None:
@@ -72,34 +73,35 @@ def add_uic_stubs(temp_folder: Path) -> None:
     Expects the temporary folder into which upstream PyQt6 was downloaded.
     """
     uic_files = temp_folder.joinpath("PyQt6").joinpath("uic").rglob("*.py")
-    with tempfile.TemporaryDirectory() as gen_stub_temp_folder:
-        options = Options(
-            pyversion=sys.version_info[:2],
-            no_import=False,
-            doc_dir="",
-            search_path=[],
-            interpreter="",
-            parse_only=False,
-            ignore_errors=False,
-            include_private=False,
-            output_dir=gen_stub_temp_folder,
-            modules=[],
-            packages=[],
-            files=[str(file) for file in uic_files],
-            verbose=False,
-            quiet=False,
-            export_less=False,
-        )
-        generate_stubs(options)
-        uic_path = SRC_DIR / "uic"
-        shutil.rmtree(uic_path)
-        shutil.copytree(Path(gen_stub_temp_folder) / "PyQt6" / "uic", uic_path)
+    gen_stub_temp_folder = mkdtemp(dir=temp_folder)
+    options = Options(
+        pyversion=sys.version_info[:2],
+        no_import=False,
+        doc_dir="",
+        search_path=[],
+        interpreter="",
+        parse_only=False,
+        ignore_errors=False,
+        include_private=False,
+        output_dir=gen_stub_temp_folder,
+        modules=[],
+        packages=[],
+        files=[str(file) for file in uic_files],
+        verbose=False,
+        quiet=False,
+        export_less=False,
+    )
+    generate_stubs(options)
+    uic_path = SRC_DIR / "uic"
+    shutil.rmtree(uic_path)
+    shutil.copytree(Path(gen_stub_temp_folder) / "PyQt6" / "uic", uic_path)
 
 
-if __name__ == "__main__":
+def generate_stubs_from_upstream():
+    files = []
     for arg in sys.argv[1:]:
         print(f"Adding file to process list: {arg}")
-    files = sys.argv[1:]
+        files.append(arg)
 
     # Create PyQt6-stubs folder if necessary
     SRC_DIR.mkdir(exist_ok=True)
@@ -154,3 +156,7 @@ def add_uic_stubs(temp_folder: Path) -> None:
     subprocess.check_call(
         ["black", "--safe", "--quiet", "-l 10000", str(SRC_DIR)]
     )
+
+
+if __name__ == "__main__":
+    generate_stubs_from_upstream()