ruff fix

Author: the-roaring

changeset/changelog.py

@@ -8,21 +8,19 @@
 import os
 import re
 import subprocess
-from datetime import datetime
 from pathlib import Path
 
 import click
-import toml
-import tomllib
 
 # Import from changeset.py to reuse logic
 from changeset.changeset import (
-    determine_version_bump,
     bump_version,
+    determine_version_bump,
     find_project_pyproject,
-    get_changesets as get_changesets_from_changeset,
     get_current_version,
-    parse_changeset,
+)
+from changeset.changeset import (
+    get_changesets as get_changesets_from_changeset,
 )
 
 CHANGESET_DIR = Path(".changeset")
@@ -42,7 +40,7 @@ def load_config() -> dict:
 def get_git_info() -> dict:
     """Get git information for the current commit/PR."""
     info = {}
-    
+
     # Get the current commit hash
     try:
         result = subprocess.run(
@@ -52,9 +50,9 @@ def get_git_info() -> dict:
             check=True
         )
         info["commit"] = result.stdout.strip()[:7]  # Short hash
-    except:
+    except Exception:
         info["commit"] = None
-    
+
     # Get GitHub repo info
     try:
         result = subprocess.run(
@@ -70,9 +68,9 @@ def get_git_info() -> dict:
             info["owner"] = match.group(1)
             info["repo"] = match.group(2)
             info["repo_url"] = f"https://github.com/{info['owner']}/{info['repo']}"
-    except:
+    except Exception:
         pass
-    
+
     return info
 
 
@@ -83,17 +81,17 @@ def get_pr_metadata() -> dict:
         "pr_author": os.environ.get("PR_AUTHOR"),
         "commit_hash": os.environ.get("COMMIT_SHA", ""),
     }
-    
+
     # Always get git info for repo URL
     git_info = get_git_info()
-    
+
     # Use git commit if not in environment
     if not metadata["commit_hash"]:
         metadata["commit_hash"] = git_info.get("commit", "")
-    
+
     # Always use repo URL from git
     metadata["repo_url"] = git_info.get("repo_url", "")
-    
+
     return metadata
 
 
@@ -108,25 +106,25 @@ def format_changelog_entry(
     pr_author = pr_metadata.get("pr_author")
     commit_hash = pr_metadata.get("commit_hash", "")[:7]
     repo_url = pr_metadata.get("repo_url", "")
-    
+
     # Build the entry
     parts = []
-    
+
     # Add PR link if available
     if pr_number and repo_url:
         parts.append(f"[#{pr_number}]({repo_url}/pull/{pr_number})")
-    
+
     # Add commit link if available
     if commit_hash and repo_url:
         parts.append(f"[`{commit_hash}`]({repo_url}/commit/{commit_hash})")
-    
+
     # Add author thanks if available
     if pr_author:
         parts.append(f"Thanks @{pr_author}!")
-    
+
     # Add description
     parts.append(f"- {description}")
-    
+
     return " ".join(parts)
 
 
@@ -139,40 +137,40 @@ def generate_changelog_section(
 ) -> str:
     """Generate changelog section for a package version."""
     lines = []
-    
+
     # Add version header
     lines.append(f"## {new_version}")
     lines.append("")
-    
+
     # Group entries by change type
     grouped = {}
     for entry in entries:
         change_type = entry["type"]
         if change_type not in grouped:
             grouped[change_type] = []
         grouped[change_type].append(entry)
-    
+
     # Add sections for each change type
     for change_type in ["major", "minor", "patch"]:
         if change_type not in grouped:
             continue
-            
+
         # Get the change type label
         type_label = {
             "major": "Major Changes",
             "minor": "Minor Changes",
             "patch": "Patch Changes"
         }.get(change_type, f"{change_type.capitalize()} Changes")
-        
+
         lines.append(f"### {type_label}")
         lines.append("")
-        
+
         # Add each entry
         for entry in grouped[change_type]:
             lines.append(format_changelog_entry(entry, config, pr_metadata))
-        
+
         lines.append("")
-    
+
     return "\n".join(lines).strip()
 
 
@@ -187,11 +185,11 @@ def update_or_create_changelog(
     else:
         # Create new changelog with package name header
         content = f"# {package_name}\n\n"
-    
+
     # Insert the new section after the package name header
     lines = content.split("\n")
     insert_index = None
-    
+
     # Find where to insert (after header, before first version)
     for i, line in enumerate(lines):
         if line.startswith("# "):
@@ -203,7 +201,7 @@ def update_or_create_changelog(
             if insert_index is None:
                 insert_index = i + 1
             break
-    
+
     if insert_index is None:
         # No header found, just prepend
         new_content = new_section + "\n\n" + content
@@ -212,7 +210,7 @@ def update_or_create_changelog(
         lines.insert(insert_index, new_section)
         lines.insert(insert_index + 1, "")
         new_content = "\n".join(lines)
-    
+
     # Write the updated content
     changelog_path.write_text(new_content)
     return True
@@ -221,26 +219,26 @@ def update_or_create_changelog(
 def generate_pr_description(package_updates: list[dict]) -> str:
     """Generate a combined PR description for all package updates."""
     lines = ["# Releases", ""]
-    
+
     for update in package_updates:
         package = update["package"]
         version = update["version"]
         changelog_content = update["changelog_content"]
-        
+
         # Add package header
         lines.append(f"## {package}@{version}")
         lines.append("")
-        
+
         # Add the changelog content (without the package header)
         # Skip the first line if it's a version header
         changelog_lines = changelog_content.split("\n")
         start_index = 0
         if changelog_lines and changelog_lines[0].startswith("## "):
             start_index = 1
-        
+
         lines.extend(changelog_lines[start_index:])
         lines.append("")
-    
+
     return "\n".join(lines)
 
 
@@ -251,16 +249,16 @@ def process_changesets_for_changelog() -> tuple[list[dict], str]:
     """
     config = load_config()
     pr_metadata = get_pr_metadata()
-    
+
     # Get all changesets
     changesets = get_changesets_from_changeset()
     if not changesets:
         return [], ""
-    
+
     # Group changesets by package
     package_changes = {}
     changeset_files = set()
-    
+
     for filepath, package, change_type, desc in changesets:
         changeset_files.add(filepath)
         if package not in package_changes:
@@ -271,23 +269,23 @@ def process_changesets_for_changelog() -> tuple[list[dict], str]:
             "description": desc,
             "changeset": filepath.name
         })
-    
+
     # Process each package
     package_updates = []
-    
+
     for package, info in package_changes.items():
         # Find pyproject.toml
         try:
             pyproject_path = find_project_pyproject(package)
         except ValueError as e:
             click.echo(click.style(f"⚠️  {e}", fg="yellow"))
             continue
-        
+
         # Determine new version
         bump_type = determine_version_bump(info["changes"])
         current_version = get_current_version(pyproject_path)
         new_version = bump_version(current_version, bump_type)
-        
+
         # Generate changelog content
         changelog_content = generate_changelog_section(
             package,
@@ -296,10 +294,10 @@ def process_changesets_for_changelog() -> tuple[list[dict], str]:
             config,
             pr_metadata
         )
-        
+
         # Find changelog path (same directory as pyproject.toml)
         changelog_path = pyproject_path.parent / "CHANGELOG.md"
-        
+
         package_updates.append({
             "package": package,
             "version": new_version,
@@ -308,68 +306,88 @@ def process_changesets_for_changelog() -> tuple[list[dict], str]:
             "changelog_content": changelog_content,
             "pyproject_path": pyproject_path,
         })
-    
+
     # Generate PR description
     pr_description = generate_pr_description(package_updates)
-    
+
     return package_updates, pr_description
 
 
 @click.command()
-@click.option("--dry-run", is_flag=True, help="Show what would be done without making changes")
+@click.option(
+    "--dry-run", is_flag=True, help="Show what would be done without making changes"
+)
 @click.option("--output-pr-description", help="File to write PR description to")
 def main(dry_run: bool, output_pr_description: str):
     """Generate changelogs from changesets with version bumping."""
-    
+
     click.echo(click.style("📜 Generating changelogs...\n", fg="cyan", bold=True))
-    
+
     # Process changesets
     package_updates, pr_description = process_changesets_for_changelog()
-    
+
     if not package_updates:
         click.echo(click.style("No changesets found. Nothing to do!", fg="yellow"))
         return
-    
+
     # Show what will be done
-    click.echo(click.style(f"Found updates for {len(package_updates)} package(s):", fg="green"))
+    click.echo(
+        click.style(f"Found updates for {len(package_updates)} package(s):", fg="green")
+    )
     for update in package_updates:
-        click.echo(f"  📦 {update['package']}: {update['current_version']} → {update['version']}")
-    
+        current = update['current_version']
+        new = update['version']
+        click.echo(f"  📦 {update['package']}: {current} → {new}")
+
     if dry_run:
-        click.echo(click.style("\n🔍 Dry run mode - no changes will be made", fg="yellow"))
+        click.echo(
+            click.style("\n🔍 Dry run mode - no changes will be made", fg="yellow")
+        )
         click.echo("\n" + "="*60)
         click.echo(click.style("PR Description:", fg="cyan"))
         click.echo("="*60)
         click.echo(pr_description)
         click.echo("="*60)
-        
+
         for update in package_updates:
-            click.echo(click.style(f"\nChangelog for {update['changelog_path']}:", fg="cyan"))
+            click.echo(
+                click.style(f"\nChangelog for {update['changelog_path']}:", fg="cyan")
+            )
             click.echo("-"*60)
             click.echo(update["changelog_content"])
             click.echo("-"*60)
         return
-    
+
     # Update changelog files
     for update in package_updates:
         success = update_or_create_changelog(
             update["changelog_path"],
             update["package"],
             update["changelog_content"]
         )
-        
+
         if success:
-            click.echo(click.style(f"✅ Updated {update['changelog_path']}", fg="green"))
+            click.echo(
+                click.style(f"✅ Updated {update['changelog_path']}", fg="green")
+            )
         else:
-            click.echo(click.style(f"❌ Failed to update {update['changelog_path']}", fg="red"))
-    
+            click.echo(
+                click.style(f"❌ Failed to update {update['changelog_path']}", fg="red")
+            )
+
     # Write PR description if requested
     if output_pr_description:
         Path(output_pr_description).write_text(pr_description)
-        click.echo(click.style(f"✅ Wrote PR description to {output_pr_description}", fg="green"))
-    
-    click.echo(click.style("\n✅ Changelog generation complete!", fg="green", bold=True))
+        click.echo(
+            click.style(
+                f"✅ Wrote PR description to {output_pr_description}", fg="green"
+            )
+        )
+
+    click.echo(
+        click.style("\n✅ Changelog generation complete!", fg="green", bold=True)
+    )
 
 
 if __name__ == "__main__":
-    main()
+    main()