Squash several bugs, support python -m calls

Author: robbievanleeuwen

pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
 ]
 
 [project.scripts]
-upgrade-dependencies = "upgrade_dependencies.main:main"
+upgrade-dependencies = "upgrade_dependencies.main:app"
 
 [dependency-groups]
 dev = [

src/upgrade_dependencies/__main__.py

@@ -0,0 +1,5 @@
+"""Support 'python -m upgrade-dependencies'."""
+
+from .main import app
+
+app(prog_name="rick-portal-gun")

src/upgrade_dependencies/dependency.py

@@ -116,6 +116,7 @@ def __init__(
         self,
         package_name: str,
         specifier: SpecifierSet,
+        extras: list[str],
         base: bool = True,
         extra: str | None = None,
         group: str | None = None,
@@ -125,6 +126,7 @@ def __init__(
         Args:
             package_name: _description_
             specifier: _description_
+            extras: _description_
             base: _description_. Defaults to True.
             extra: _description_. Defaults to None.
             group: _description_. Defaults to None.
@@ -133,6 +135,7 @@ def __init__(
             package_name=canonicalize_name(package_name),
             specifier=specifier,
         )
+        self.extras = extras
         self.base = base
         self.extra = extra
         self.group = group
@@ -177,6 +180,17 @@ def short_name(self) -> str:
         """
         return self.package_name
 
+    @property
+    def package_plus_extras(self) -> str:
+        """_summary_.
+
+        Returns:
+            _description_
+        """
+        str_extras = f"[{",".join(self.extras)}]" if len(self.extras) > 0 else ""
+
+        return f"{self.package_name}{str_extras}"
+
 
 class GitHubDependency(Dependency):
     """_summary_."""
@@ -188,6 +202,7 @@ def __init__(
         action: bool,
         pre_commit: bool,
         full_version: str | None = None,
+        has_v: bool = True,
     ) -> None:
         """_summary_.
 
@@ -197,6 +212,7 @@ def __init__(
             action: _description_
             pre_commit: _description_
             full_version: _description_
+            has_v: _description_
         """
         super().__init__(package_name=package_name, specifier=specifier)
 
@@ -211,6 +227,7 @@ def __init__(
         self.action = action
         self.pre_commit = pre_commit
         self.full_version = full_version
+        self.has_v = has_v
 
     def get_latest_version(self) -> Version:
         """Gets the latest version of the dependency from GitHub.

src/upgrade_dependencies/main.py

@@ -33,7 +33,7 @@ def list_dependencies():
     text = Text()
 
     for idx, base_dep in enumerate(project.base_dependencies):
-        text.append(base_dep.package_name)
+        text.append(base_dep.package_plus_extras)
         text.append(str(base_dep.specifier), style="green")
 
         if idx < len(project.base_dependencies) - 1:
@@ -50,7 +50,7 @@ def list_dependencies():
         text = Text()
 
         for idx, opt_dep in enumerate(opt_deps):
-            text.append(opt_dep.package_name)
+            text.append(opt_dep.package_plus_extras)
             text.append(str(opt_dep.specifier), style="green")
 
             if idx < len(opt_deps) - 1:
@@ -73,7 +73,7 @@ def list_dependencies():
         text = Text()
 
         for idx, group_dep in enumerate(group_deps):
-            text.append(group_dep.package_name)
+            text.append(group_dep.package_plus_extras)
             text.append(str(group_dep.specifier), style="green")
 
             if idx < len(group_deps) - 1:
@@ -320,7 +320,7 @@ def update(
             dep = project.get_dependency(name=dependency)
             old_ver = str(sorted(dep.specifier, key=str)[0].version)
         except RuntimeError as e:
-            rprint(f"Cannot find {dependency} in {project.name}.")
+            rprint(f":no_entry_sign: Cannot find {dependency} in {project.name}.")
             raise typer.Exit(code=1) from e
 
         # fetch data from pypi/github
@@ -390,12 +390,16 @@ def update(
             url = f"https://pypi.org/project/{dep.package_name}"
             pr_body = f"Bumps [{dep.package_name}]({url}) from {old_ver} to {version}."
         elif isinstance(dep, GitHubDependency):
-            old_v = Version(old_ver)
-            v = Version(version)
             url = f"https://github.com/{dep.owner}/{dep.repo}"
-            pr_body = (
-                f"Bumps [{dep.package_name}]({url}) from v{old_v.major} to v{v.major}."
-            )
+            if dep.action:
+                old_v = Version(old_ver)
+                v = Version(version)
+                pr_body = f"Bumps [{dep.package_name}]({url}) from v{old_v.major} to"
+                pr_body += f" v{v.major}."
+            else:
+                pr_body = (
+                    f"Bumps [{dep.package_name}]({url}) from {old_ver} to {version}."
+                )
         else:
             pr_body = ""
 
@@ -430,8 +434,3 @@ def update(
 def format_yml():
     """Formats the workflow and pre-commit config yaml files."""
     utils.format_all_yml_files()
-
-
-def main():
-    """_summary_."""
-    app()

src/upgrade_dependencies/project.py

@@ -90,6 +90,7 @@ def save_pypi_dependencies(
                 {
                     "package_name": req.name,
                     "specifier": req.specifier,
+                    "extras": list(req.extras),
                     "base": True,
                     "extra": None,
                     "group": None,
@@ -107,6 +108,7 @@ def save_pypi_dependencies(
                         {
                             "package_name": req.name,
                             "specifier": req.specifier,
+                            "extras": list(req.extras),
                             "base": False,
                             "extra": extra,
                             "group": None,
@@ -124,6 +126,7 @@ def save_pypi_dependencies(
                         {
                             "package_name": req.name,
                             "specifier": req.specifier,
+                            "extras": list(req.extras),
                             "base": False,
                             "extra": None,
                             "group": group,
@@ -146,6 +149,7 @@ def save_pypi_dependencies(
                     PyPIDependency(
                         package_name="uv",
                         specifier=SpecifierSet(f"=={uv_version[0]}"),
+                        extras=[],
                         base=False,
                         group="uv",
                     ),
@@ -209,13 +213,15 @@ def save_github_dependencies(
                 owner = url.split("/")[-2]
                 repo = url.split("/")[-1]
                 v = Version(pc_repo["rev"])
+                has_v = pc_repo["rev"][0] == "v"
 
                 self.dependencies.append(
                     GitHubDependency(
                         package_name=f"{owner}/{repo}",
                         specifier=SpecifierSet(f"=={v}"),
                         action=False,
                         pre_commit=True,
+                        has_v=has_v,
                     ),
                 )
 
@@ -346,7 +352,6 @@ async def fetch_all_github_data(self) -> None:
                 for dep in self.dependencies
                 if isinstance(dep, GitHubDependency)
             ],
-            return_exceptions=True,
         )
 
     def github_dependency_data_async(self) -> None:
@@ -498,6 +503,8 @@ def build_new_requirement(
         _description_
     """
     name = old_requirement.name
+    extras = list(old_requirement.extras)
     spec = sorted(old_requirement.specifier, key=str)[0].operator
+    str_extras = f"[{",".join(extras)}]" if len(extras) > 0 else ""
 
-    return f"{name}{spec}{new_version}"
+    return f"{name}{str_extras}{spec}{new_version}"

src/upgrade_dependencies/utils.py

@@ -243,7 +243,8 @@ def update_pre_commit(
 
     for repo in data["repos"]:  # pyright: ignore
         if repo["repo"] == url:
-            repo["rev"] = f"v{new_version}"
+            v_str = "v" if dependency.has_v else ""
+            repo["rev"] = f"{v_str}{new_version}"
 
     # temp_file = Path(file_path).with_suffix(".temp")
     with Path(file_path).open("w") as temp_f:
@@ -292,10 +293,11 @@ def get_git_status() -> list[str]:
     changed_files: list[str] = []
 
     for line in result.stdout.strip().split("\n"):
-        status, file_path = line.split(maxsplit=1)  # status and file name
+        if len(line) > 0:
+            status, file_path = line.split(maxsplit=1)  # status and file name
 
-        if status in ["M", "A", "D"]:  # modified, added, or deleted
-            changed_files.append(file_path)
+            if status in ["M", "A", "D"]:  # modified, added, or deleted
+                changed_files.append(file_path)
 
     return changed_files
 

todo.md

@@ -10,8 +10,8 @@
 - [x] Implement CLI
 - [x] Create changes to files
 - [x] Create pull request
-- [ ] Add format yml files
+- [x] Add format yml files
 - [ ] Documentation
 - [ ] Handle uv better (not group)
-- [ ] Handle pre-commit yml (not yaml)
+- [ ] Handle pre-commit yml extension (not yaml)
 - [ ] Add tests