diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 132ce6035..597eb4b3d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,24 +4,23 @@ repos: hooks: - id: seed-isort-config - repo: https://github.com/timothycrosley/isort - rev: 5.10.1 + rev: 5.12.0 hooks: - id: isort - repo: https://github.com/ambv/black - rev: 22.10.0 + rev: 23.1.0 hooks: - id: black - repo: https://github.com/pycqa/flake8 - rev: 5.0.4 + rev: 6.0.0 hooks: - id: flake8 additional_dependencies: - "flake8-coding==1.3.1" - - "flake8-copyright==0.2.3" - "flake8-debugger==3.1.0" - "flake8-mypy==17.8.0" - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.3.0 + rev: v4.4.0 hooks: - id: check-ast - id: check-docstring-first diff --git a/backend/code_review_backend/issues/api.py b/backend/code_review_backend/issues/api.py index 715a94213..17efb305b 100644 --- a/backend/code_review_backend/issues/api.py +++ b/backend/code_review_backend/issues/api.py @@ -301,7 +301,6 @@ class IssueCheckHistory(CachedView, generics.ListAPIView): pagination_class = None def get_queryset(self): - # Count all the issues per day queryset = ( Issue.objects.annotate(date=TruncDate("created")) diff --git a/backend/code_review_backend/issues/management/commands/load_issues.py b/backend/code_review_backend/issues/management/commands/load_issues.py index 26a3ef502..2cca40dfd 100644 --- a/backend/code_review_backend/issues/management/commands/load_issues.py +++ b/backend/code_review_backend/issues/management/commands/load_issues.py @@ -63,7 +63,6 @@ def handle(self, *args, **options): ) for task_id, report in tasks: - # Build revision & diff revision, diff = self.build_revision_and_diff(report["revision"], task_id) @@ -118,7 +117,6 @@ def load_tasks(self, environment, chunk=200): token = None while True: - query = {"limit": chunk} if token is not None: query["continuationToken"] = token @@ -127,7 +125,6 @@ def load_tasks(self, environment, chunk=200): ) for task in data["tasks"]: - if not task["data"].get("issues"): continue @@ -137,7 +134,6 @@ def load_tasks(self, environment, chunk=200): artifact = json.load(open(path)) else: - # Download the task report logging.info(f"Download task {task['taskId']}") try: diff --git a/backend/code_review_backend/issues/migrations/0001_initial.py b/backend/code_review_backend/issues/migrations/0001_initial.py index 78ed5bbfa..bf750a32a 100644 --- a/backend/code_review_backend/issues/migrations/0001_initial.py +++ b/backend/code_review_backend/issues/migrations/0001_initial.py @@ -13,7 +13,6 @@ class Migration(migrations.Migration): - initial = True dependencies = [] diff --git a/backend/code_review_backend/issues/migrations/0002_compare_issues.py b/backend/code_review_backend/issues/migrations/0002_compare_issues.py index 61363ac50..cbe15ce2b 100644 --- a/backend/code_review_backend/issues/migrations/0002_compare_issues.py +++ b/backend/code_review_backend/issues/migrations/0002_compare_issues.py @@ -37,7 +37,6 @@ def set_existing_as_new(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [("issues", "0001_initial")] operations = [ diff --git a/backend/code_review_backend/issues/migrations/0003_diff_repository.py b/backend/code_review_backend/issues/migrations/0003_diff_repository.py index bbbaab6f3..6beaf0daf 100644 --- a/backend/code_review_backend/issues/migrations/0003_diff_repository.py +++ b/backend/code_review_backend/issues/migrations/0003_diff_repository.py @@ -40,7 +40,6 @@ def _create_diff_repos(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [("issues", "0002_compare_issues")] operations = [ diff --git a/backend/code_review_backend/issues/migrations/0004_issue_in_patch.py b/backend/code_review_backend/issues/migrations/0004_issue_in_patch.py index cbba4c43f..fa01400e5 100644 --- a/backend/code_review_backend/issues/migrations/0004_issue_in_patch.py +++ b/backend/code_review_backend/issues/migrations/0004_issue_in_patch.py @@ -10,7 +10,6 @@ class Migration(migrations.Migration): - dependencies = [("issues", "0003_diff_repository")] operations = [ diff --git a/backend/code_review_backend/issues/migrations/0005_rename_check_issue_analyzer_check.py b/backend/code_review_backend/issues/migrations/0005_rename_check_issue_analyzer_check.py index cb09bb236..0f3a06f1c 100644 --- a/backend/code_review_backend/issues/migrations/0005_rename_check_issue_analyzer_check.py +++ b/backend/code_review_backend/issues/migrations/0005_rename_check_issue_analyzer_check.py @@ -9,7 +9,6 @@ class Migration(migrations.Migration): - dependencies = [ ("issues", "0004_issue_in_patch"), ] diff --git a/backend/code_review_backend/issues/migrations/0006_issuelink_initial.py b/backend/code_review_backend/issues/migrations/0006_issuelink_initial.py index bd514b90b..616d58722 100644 --- a/backend/code_review_backend/issues/migrations/0006_issuelink_initial.py +++ b/backend/code_review_backend/issues/migrations/0006_issuelink_initial.py @@ -18,7 +18,6 @@ def clean_unlinked_issue(apps, schema_editor): class Migration(migrations.Migration): - dependencies = [ ("issues", "0005_rename_check_issue_analyzer_check"), ] diff --git a/backend/code_review_backend/issues/tests/commands/test_cleanup_issues.py b/backend/code_review_backend/issues/tests/commands/test_cleanup_issues.py index 863007414..eba1a7a8d 100644 --- a/backend/code_review_backend/issues/tests/commands/test_cleanup_issues.py +++ b/backend/code_review_backend/issues/tests/commands/test_cleanup_issues.py @@ -58,7 +58,7 @@ def setUp(self): ) ] ) - for (rev, days_ago) in ((rev_1, 35), (rev_2, 15), (rev_3, 1)): + for rev, days_ago in ((rev_1, 35), (rev_2, 15), (rev_3, 1)): rev.created = timezone.now() - timedelta(days=days_ago) rev.save(update_fields=["created"]) diff --git a/backend/code_review_backend/issues/tests/test_issue.py b/backend/code_review_backend/issues/tests/test_issue.py index 14828a505..b03378a12 100644 --- a/backend/code_review_backend/issues/tests/test_issue.py +++ b/backend/code_review_backend/issues/tests/test_issue.py @@ -12,7 +12,6 @@ class IssueTestCase(TestCase): def test_publishable(self): - # A warning is not publishable issue = Issue.objects.create(path="some/file", line=12, level=LEVEL_WARNING) self.assertFalse(issue.publishable) diff --git a/backend/code_review_backend/issues/tests/test_revision.py b/backend/code_review_backend/issues/tests/test_revision.py index 8f139c884..e94df6435 100644 --- a/backend/code_review_backend/issues/tests/test_revision.py +++ b/backend/code_review_backend/issues/tests/test_revision.py @@ -17,7 +17,6 @@ def setUp(self): ) def test_phabricator_url(self): - rev = Revision.objects.create( id=12, phid="PHID-REV-12345", repository=self.repo ) diff --git a/bot/code_review_bot/cli.py b/bot/code_review_bot/cli.py index f63c5582a..576b37674 100644 --- a/bot/code_review_bot/cli.py +++ b/bot/code_review_bot/cli.py @@ -63,7 +63,6 @@ def parse_cli(): @stats.timer("runtime.analysis") def main(): - args = parse_cli() taskcluster.auth(args.taskcluster_client_id, args.taskcluster_access_token) diff --git a/bot/code_review_bot/revisions.py b/bot/code_review_bot/revisions.py index d47575655..f1b713411 100644 --- a/bot/code_review_bot/revisions.py +++ b/bot/code_review_bot/revisions.py @@ -90,7 +90,6 @@ def __init__( url=None, patch=None, ): - # Identification self.id = id self.phid = phid diff --git a/bot/code_review_bot/tasks/base.py b/bot/code_review_bot/tasks/base.py index 143b977d2..c6fd96eb7 100644 --- a/bot/code_review_bot/tasks/base.py +++ b/bot/code_review_bot/tasks/base.py @@ -74,7 +74,6 @@ def build_from_route(cls, index_service, queue_service): return cls(task_id, task_status) def load_artifacts(self, queue_service): - # Process only the supported final states # as some tasks do not always have relevant output if self.state in self.skipped_states: diff --git a/bot/code_review_bot/workflow.py b/bot/code_review_bot/workflow.py index 1c5993db2..ee36b1e59 100644 --- a/bot/code_review_bot/workflow.py +++ b/bot/code_review_bot/workflow.py @@ -382,7 +382,6 @@ def _in_group(dep_id): # Report a problem when tasks in erroneous state are found # but no issue or patch has been processed by the bot if task.state == "failed" and not task_issues and not task_patches: - # Skip task that are listed as ignorable (we try to avoid unnecessary spam) if task.name in self.task_failures_ignored: logger.warning( diff --git a/bot/tools/fix_missing.py b/bot/tools/fix_missing.py index 626063257..c691e55a5 100644 --- a/bot/tools/fix_missing.py +++ b/bot/tools/fix_missing.py @@ -124,7 +124,6 @@ def list_pushes(known_revisions, updates, min_date, max_date): def find_task(push_id): - # Find the task ids from Treeherder resp = requests.get( TREEHERDER_JOBS_URL, {"push_id": push_id}, headers=TREEHERDER_HEADERS diff --git a/events/code_review_events/workflow.py b/events/code_review_events/workflow.py index 32cd1df8c..9987ee8b2 100644 --- a/events/code_review_events/workflow.py +++ b/events/code_review_events/workflow.py @@ -138,7 +138,6 @@ async def process_build(self, build): self.update_state(build) if build.state == PhabricatorBuildState.Public: - # Check if the author is not blacklisted if self.is_blacklisted(build.revision): return @@ -375,7 +374,6 @@ def __init__(self, cache_root): # Run webserver & pulse on web dyno or single instance if not heroku.in_dyno() or heroku.in_web_dyno(): - # Create web server self.webserver = WebServer(QUEUE_WEB_BUILDS) self.webserver.register(self.bus) diff --git a/events/tests/conftest.py b/events/tests/conftest.py index 85f9f591b..0b3662f13 100644 --- a/events/tests/conftest.py +++ b/events/tests/conftest.py @@ -118,7 +118,6 @@ def _user_search(request): return (200, json_headers, _response(mock_name)) with responses.RequestsMock(assert_all_requests_are_fired=False) as resp: - resp.add( responses.POST, "http://phabricator.test/api/user.whoami", diff --git a/integration/tests/test_workflow.py b/integration/tests/test_workflow.py index 538e24c2f..89f37a7f1 100644 --- a/integration/tests/test_workflow.py +++ b/integration/tests/test_workflow.py @@ -7,7 +7,6 @@ def test_publish(monkeypatch, workflow, tmpdir, mock_taskcluster): - # Fake repo repo_dir = tmpdir.realpath() hg = tmpdir.mkdir(".hg") diff --git a/tools/code_review_tools/log.py b/tools/code_review_tools/log.py index fb4e18d0d..bb0a12565 100644 --- a/tools/code_review_tools/log.py +++ b/tools/code_review_tools/log.py @@ -129,7 +129,6 @@ def init_logger( PAPERTRAIL_PORT=None, SENTRY_DSN=None, ): - if not channel: channel = os.environ.get("APP_CHANNEL")