feat: improve git setup logic

Author: 56kyle

{{cookiecutter.project_name}}/noxfile.py

@@ -26,6 +26,8 @@
 REPO_ROOT: Path = Path(__file__).parent.resolve()
 SCRIPTS_FOLDER: Path = REPO_ROOT / "scripts"
 CRATES_FOLDER: Path = REPO_ROOT / "rust"
+
+PROJECT_NAME: str = "{{cookiecutter.project_name}}"
 PACKAGE_NAME: str = "{{cookiecutter.package_name}}"
 GITHUB_USER: str = "{{cookiecutter.github_user}}"
 
@@ -48,7 +50,7 @@
 def setup_git(session: Session) -> None:
     """Set up the git repo for the current project."""
     session.run(
-        "python", SCRIPTS_FOLDER / "setup-git.py", REPO_ROOT, "-u", GITHUB_USER, "-n", PACKAGE_NAME, external=True
+        "python", SCRIPTS_FOLDER / "setup-git.py", REPO_ROOT, "-u", GITHUB_USER, "-n", PROJECT_NAME, external=True
     )
 
 

{{cookiecutter.project_name}}/scripts/setup-git.py

@@ -21,10 +21,12 @@ def setup_git(path: Path, github_user: str, repo_name: str) -> None:
     """Set up the provided cookiecutter-robust-python project's git repo."""
     commands: list[list[str]] = [
         ["git", "init"],
-        ["git", "branch", "-M", "main"],
+        ["git", "branch", "-m", "master", "main"],
+        ["git", "checkout", "main"],
         ["git", "remote", "add", "origin", f"https://github.com/{github_user}/{repo_name}.git"],
         ["git", "remote", "set-url", "origin", f"https://github.com/{github_user}/{repo_name}.git"],
         ["git", "fetch", "origin"],
+        ["git", "pull"],
         ["git", "push", "-u", "origin", "main"],
         ["git", "checkout", "-b", "develop", "main"],
         ["git", "push", "-u", "origin", "develop"],
@@ -35,7 +37,7 @@ def setup_git(path: Path, github_user: str, repo_name: str) -> None:
     check_dependencies(path=path, dependencies=["git"])
 
     for command in commands:
-        subprocess.run(command, cwd=path, stdout=subprocess.STDOUT, stderr=subprocess.STDOUT)
+        subprocess.run(command, cwd=path, stderr=subprocess.STDOUT)
 
 
 def get_parser() -> argparse.ArgumentParser:

{{cookiecutter.project_name}}/scripts/setup-venv.py

@@ -3,11 +3,13 @@
 Since this a first time setup script, we intentionally only use builtin Python dependencies.
 """
 import argparse
+import shutil
 import subprocess
 from pathlib import Path
 
 from util import check_dependencies
 from util import existing_dir
+from util import remove_readonly
 
 
 def main() -> None:
@@ -49,6 +51,10 @@ def setup_venv(path: Path, python_version: str) -> None:
     ]
     check_dependencies(path=path, dependencies=["uv"])
 
+    venv_path: Path = path / ".venv"
+    if venv_path.exists():
+        shutil.rmtree(venv_path, onerror=remove_readonly)
+
     for command in commands:
         subprocess.run(command, cwd=path, capture_output=True)
 

{{cookiecutter.project_name}}/scripts/util.py

@@ -1,7 +1,11 @@
 """Module containing util"""
 import argparse
+import os
+import stat
 import subprocess
 from pathlib import Path
+from typing import Any
+from typing import Callable
 
 
 class MissingDependencyError(Exception):
@@ -32,3 +36,12 @@ def existing_dir(value: str) -> Path:
         raise argparse.ArgumentTypeError(f"{path} is not a directory.")
 
     return path
+
+
+def remove_readonly(func: Callable[[str], Any], path: str, _: Any) -> None:
+    """Clears the readonly bit and attempts to call the provided function.
+
+    This is passed to shutil.rmtree as the onerror kwarg.
+    """
+    os.chmod(path, stat.S_IWRITE)
+    func(path)