Compare commits

...

3 Commits

Author SHA1 Message Date
4e536e5859 fix: replace subprocess.run with run_cmd for ruff check to fix test failure
All checks were successful
Run Python tests (through Pytest) / Test (push) Successful in 24s
Verify Python project can be installed, loaded and have version checked / Test (push) Successful in 22s
2025-04-20 01:15:19 +02:00
79b75dc165 feat: add code quality pass to fix lint issues with aider before pushing 2025-04-20 01:14:52 +02:00
ce46cec191 Initial ruff pass 2025-04-20 01:14:18 +02:00
2 changed files with 23 additions and 5 deletions

View File

@ -240,7 +240,9 @@ def push_changes(
# Get commit messages for PR description # Get commit messages for PR description
commit_messages = get_commit_messages( commit_messages = get_commit_messages(
cwd, repository_config.base_branch, branch_name, cwd,
repository_config.base_branch,
branch_name,
) )
description = f'This pull request resolves #{issue_number}\n\n' description = f'This pull request resolves #{issue_number}\n\n'
@ -266,7 +268,9 @@ def push_changes(
# Extract PR number and URL if available # Extract PR number and URL if available
return IssueResolution( return IssueResolution(
True, str(pr_response.get('number')), pr_response.get('html_url'), True,
str(pr_response.get('number')),
pr_response.get('html_url'),
) )
@ -376,6 +380,14 @@ def solve_issue_in_repository(
) )
return IssueResolution(False) return IssueResolution(False)
# Code quality pass: ensure ruff passes
if not run_cmd(['bash', '-c', 'ruff check .'], tmpdirname, check=False):
logger.info('Code quality issues detected, invoking aider to fix lint...')
run_cmd(create_aider_command(issue_content), tmpdirname, check=False)
run_cmd(['bash', '-c', RUFF_FORMAT_AND_AUTO_FIX], tmpdirname, check=False)
run_cmd(['git', 'add', '.'], tmpdirname)
run_cmd(['git', 'commit', '-m', 'Aider lint fixes'], tmpdirname, check=False)
# Push changes # Push changes
return push_changes( return push_changes(
repository_config, repository_config,
@ -388,7 +400,9 @@ def solve_issue_in_repository(
def solve_issues_in_repository( def solve_issues_in_repository(
repository_config: RepositoryConfig, client, seen_issues_db, repository_config: RepositoryConfig,
client,
seen_issues_db,
): ):
"""Process all open issues with the 'aider' label. """Process all open issues with the 'aider' label.

View File

@ -23,7 +23,9 @@ class TestHasCommitsOnBranch:
# Verify get_commit_messages was called with correct arguments # Verify get_commit_messages was called with correct arguments
mock_get_commit_messages.assert_called_once_with( mock_get_commit_messages.assert_called_once_with(
self.cwd, self.base_branch, self.current_branch, self.cwd,
self.base_branch,
self.current_branch,
) )
@patch('aider_gitea.get_commit_messages') @patch('aider_gitea.get_commit_messages')
@ -39,7 +41,9 @@ class TestHasCommitsOnBranch:
# Verify get_commit_messages was called with correct arguments # Verify get_commit_messages was called with correct arguments
mock_get_commit_messages.assert_called_once_with( mock_get_commit_messages.assert_called_once_with(
self.cwd, self.base_branch, self.current_branch, self.cwd,
self.base_branch,
self.current_branch,
) )
@patch('aider_gitea.get_commit_messages') @patch('aider_gitea.get_commit_messages')