From 2cdb3aeadf872c683bbcd5a198943374778b9968 Mon Sep 17 00:00:00 2001 From: Avasam Date: Tue, 30 Aug 2022 20:02:00 -0400 Subject: [PATCH 1/4] Fixed path separator on windows --- .gitignore | 1 + scripts/create_baseline_stubs.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cca2cf7b80d3..1cc51ae06973 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ target/ # Local utility scripts analyze.py +/out/ # Editor backup files *~ diff --git a/scripts/create_baseline_stubs.py b/scripts/create_baseline_stubs.py index afa90ddb390a..19d3b9029b8e 100755 --- a/scripts/create_baseline_stubs.py +++ b/scripts/create_baseline_stubs.py @@ -167,7 +167,7 @@ def main() -> None: sys.exit(1) project, version = info - stub_dir = os.path.join("stubs", project) + stub_dir = os.path.join("stubs", project).replace("\\", "/") if os.path.exists(stub_dir): sys.exit(f"Error: {stub_dir} already exists (delete it first)") From 7f844a6c86cdd9354d108fcfe92e6b6882f70a64 Mon Sep 17 00:00:00 2001 From: Avasam Date: Wed, 31 Aug 2022 18:09:40 -0400 Subject: [PATCH 2/4] Fix create_baseline_stubs leaving an out/ folder behind --- .gitignore | 1 - scripts/create_baseline_stubs.py | 28 +++++----------------------- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 1cc51ae06973..cca2cf7b80d3 100644 --- a/.gitignore +++ b/.gitignore @@ -56,7 +56,6 @@ target/ # Local utility scripts analyze.py -/out/ # Editor backup files *~ diff --git a/scripts/create_baseline_stubs.py b/scripts/create_baseline_stubs.py index 19d3b9029b8e..7a1766632e12 100755 --- a/scripts/create_baseline_stubs.py +++ b/scripts/create_baseline_stubs.py @@ -46,24 +46,9 @@ def get_installed_package_info(project: str) -> tuple[str, str] | None: return search_pip_freeze_output(project, r.stdout) -def run_stubgen(package: str) -> None: - print(f"Running stubgen: stubgen -p {package}") - subprocess.run(["stubgen", "-p", package], check=True) - - -def copy_stubs(src_base_dir: str, package: str, stub_dir: str) -> None: - """Copy generated stubs to the target directory under stub_dir/.""" - print(f"Copying stubs to {stub_dir}") - if not os.path.isdir(stub_dir): - os.mkdir(stub_dir) - src_dir = os.path.join(src_base_dir, package) - if os.path.isdir(src_dir): - shutil.copytree(src_dir, os.path.join(stub_dir, package)) - else: - src_file = os.path.join("out", f"{package}.pyi") - if not os.path.isfile(src_file): - sys.exit("Error: Cannot find generated stubs") - shutil.copy(src_file, stub_dir) +def run_stubgen(package: str, output: str) -> None: + print(f"Running stubgen: stubgen -o {output} -p {package}") + subprocess.run(["stubgen", "-o", output ,"-p", package], check=True) def run_black(stub_dir: str) -> None: @@ -167,14 +152,11 @@ def main() -> None: sys.exit(1) project, version = info - stub_dir = os.path.join("stubs", project).replace("\\", "/") + stub_dir = f"stubs/{project}" # Must use forward slash in the .json file if os.path.exists(stub_dir): sys.exit(f"Error: {stub_dir} already exists (delete it first)") - run_stubgen(package) - - # Stubs were generated under out/. Copy them to stubs/. - copy_stubs("out", package, stub_dir) + run_stubgen(package, stub_dir) run_isort(stub_dir) run_black(stub_dir) From 0a78941890fd7d2415391a7da2b063700ec6ee78 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 31 Aug 2022 22:11:04 +0000 Subject: [PATCH 3/4] [pre-commit.ci] auto fixes from pre-commit.com hooks --- scripts/create_baseline_stubs.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/create_baseline_stubs.py b/scripts/create_baseline_stubs.py index 7a1766632e12..5d6f25146d70 100755 --- a/scripts/create_baseline_stubs.py +++ b/scripts/create_baseline_stubs.py @@ -13,7 +13,6 @@ import argparse import os import re -import shutil import subprocess import sys @@ -48,7 +47,7 @@ def get_installed_package_info(project: str) -> tuple[str, str] | None: def run_stubgen(package: str, output: str) -> None: print(f"Running stubgen: stubgen -o {output} -p {package}") - subprocess.run(["stubgen", "-o", output ,"-p", package], check=True) + subprocess.run(["stubgen", "-o", output, "-p", package], check=True) def run_black(stub_dir: str) -> None: From de3bb632b1c36d1597dc46157e605ec916b67cff Mon Sep 17 00:00:00 2001 From: Avasam Date: Thu, 1 Sep 2022 16:11:40 -0400 Subject: [PATCH 4/4] Only ensure forward slashes in add_pyright_exclusion --- scripts/create_baseline_stubs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/create_baseline_stubs.py b/scripts/create_baseline_stubs.py index 5d6f25146d70..465ae4805e3f 100755 --- a/scripts/create_baseline_stubs.py +++ b/scripts/create_baseline_stubs.py @@ -90,7 +90,8 @@ def add_pyright_exclusion(stub_dir: str) -> None: assert i < len(lines), f"Error parsing {PYRIGHT_CONFIG}" while not lines[i].strip().startswith("]"): i += 1 - line_to_add = f' "{stub_dir}",' + # Must use forward slash in the .json file + line_to_add = f' "{stub_dir}",'.replace("\\", "/") initial = i - 1 while lines[i].lower() > line_to_add.lower(): i -= 1 @@ -151,7 +152,7 @@ def main() -> None: sys.exit(1) project, version = info - stub_dir = f"stubs/{project}" # Must use forward slash in the .json file + stub_dir = os.path.join("stubs", project) if os.path.exists(stub_dir): sys.exit(f"Error: {stub_dir} already exists (delete it first)")