sort python imports (#8404)

* remove incorrect import

* reorganize imports with isort

* add isort pre_commit hook

We add the --profile=black because Ruff and isort are only compatible
when using isort with profile=black.
astral-sh/ruff#12733

* Only put imports at the top of the file

---------

Co-authored-by: Olivier Giorgis <[email protected]>

.pre-commit-config.yaml

@@ -12,6 +12,12 @@ repos:
     hooks:
       - id: markdownlint
         args: [--fix]
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        args: [--profile=black]
+        name: isort (python)
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.14
     hooks:

misc/compare_tasks.py

@@ -6,7 +6,6 @@
 import uuid
 
 import slugid
-
 from deepdiff import DeepDiff
 from thclient import TreeherderClient
 

tests/conftest.py

@@ -4,21 +4,25 @@
 import os
 import platform
 import time
-from os.path import join, dirname
+from os.path import dirname, join
 from unittest.mock import MagicMock
-import yaml
 
 import kombu
+import moz_measure_noise
 import pytest
 import responses
+import yaml
 from _pytest.monkeypatch import MonkeyPatch
 from django.conf import settings
 from django.core.management import call_command
 from rest_framework.test import APIClient
-import moz_measure_noise
 
-from tests.autoclassify.utils import test_line, create_failure_lines, create_text_log_errors
 import treeherder.etl.bugzilla
+from tests.autoclassify.utils import (
+    create_failure_lines,
+    create_text_log_errors,
+    test_line,
+)
 from treeherder.etl.jobs import store_job_data
 from treeherder.etl.push import store_push_data
 from treeherder.model import models as th_models
@@ -365,6 +369,7 @@ def test_job_3(eleven_job_blobs, create_jobs):
 @pytest.fixture
 def mock_log_parser(monkeypatch):
     from celery import shared_task
+
     from treeherder.log_parser import tasks
 
     @shared_task

tests/e2e/test_job_ingestion.py

@@ -2,7 +2,6 @@
 
 from tests.test_utils import add_log_response
 from treeherder.etl.jobs import store_job_data
-
 from treeherder.model.error_summary import get_error_summary
 from treeherder.model.models import Job, JobLog, TextLogError
 

tests/etl/test_bugzilla.py

@@ -1,9 +1,8 @@
 import pytest
-
 from django.urls import reverse
 
 from treeherder.etl.bugzilla import BzApiBugProcess
-from treeherder.model.models import Bugscache, BugJobMap
+from treeherder.model.models import BugJobMap, Bugscache
 
 
 @pytest.mark.django_db(transaction=True)

tests/etl/test_classification_loader.py

@@ -2,9 +2,9 @@
 import datetime
 import json
 
-from requests.models import HTTPError
 import pytest
 import responses
+from requests.models import HTTPError
 
 from treeherder.etl.artifact import store_job_artifacts
 from treeherder.etl.classification_loader import ClassificationLoader

tests/etl/test_job_loader.py

@@ -4,11 +4,11 @@
 import pytest
 import responses
 import slugid
+from django.core.exceptions import ObjectDoesNotExist
 
 from treeherder.etl.job_loader import JobLoader
 from treeherder.etl.taskcluster_pulse.handler import handle_message
 from treeherder.model.models import Job, JobLog, TaskclusterMetadata
-from django.core.exceptions import ObjectDoesNotExist
 
 
 @pytest.fixture

tests/etl/test_load_artifacts.py

@@ -1,8 +1,8 @@
 import json
 
 from treeherder.etl.artifact import store_job_artifacts
-from treeherder.model.models import TextLogError
 from treeherder.model.error_summary import get_error_summary
+from treeherder.model.models import TextLogError
 
 
 def test_load_textlog_summary_twice(test_repository, test_job):

tests/etl/test_perf_data_load.py

@@ -5,7 +5,6 @@
 import time
 
 import pytest
-
 from django.core.management import call_command
 from django.db import IntegrityError
 

tests/log_parser/test_store_failure_lines.py

@@ -6,11 +6,11 @@
 from requests.exceptions import HTTPError
 
 from treeherder.log_parser.failureline import (
+    get_group_results,
     store_failure_lines,
     write_failure_lines,
-    get_group_results,
 )
-from treeherder.model.models import FailureLine, Group, JobLog, GroupStatus
+from treeherder.model.models import FailureLine, Group, GroupStatus, JobLog
 
 from ..sampledata import SampleData
 

tests/log_parser/test_tasks.py

@@ -1,11 +1,12 @@
-import pytest
 from unittest.mock import patch
 
+import pytest
+
 from tests.test_utils import add_log_response
 from treeherder.etl.jobs import store_job_data
 from treeherder.etl.push import store_push_data
-from treeherder.model.error_summary import get_error_summary, bug_suggestions_line
-from treeherder.model.models import Job, TextLogError, Bugscache
+from treeherder.model.error_summary import bug_suggestions_line, get_error_summary
+from treeherder.model.models import Bugscache, Job, TextLogError
 
 from ..sampledata import SampleData
 

tests/model/cycle_data/test_perfherder_cycling.py

@@ -1,31 +1,32 @@
 import math
 from datetime import datetime, timedelta
-from unittest.mock import MagicMock
-from unittest.mock import patch
+from unittest.mock import MagicMock, patch
 
 import pytest
 from django.core.management import call_command
-from django.db import connection, IntegrityError
+from django.db import IntegrityError, connection
 
-from treeherder.model.data_cycling import MaxRuntime
-from treeherder.model.data_cycling import PerfherderCycler
-from treeherder.model.data_cycling import PublicSignatureRemover
+from treeherder.model.data_cycling import (
+    MaxRuntime,
+    PerfherderCycler,
+    PublicSignatureRemover,
+)
 from treeherder.model.data_cycling.removal_strategies import (
-    MainRemovalStrategy,
-    TryDataRemoval,
     IrrelevantDataRemoval,
+    MainRemovalStrategy,
     StalledDataRemoval,
+    TryDataRemoval,
 )
 from treeherder.model.models import Push
 from treeherder.perf.exceptions import MaxRuntimeExceededError
 from treeherder.perf.models import (
+    BackfillReport,
+    MultiCommitDatum,
+    PerformanceAlert,
+    PerformanceAlertSummary,
     PerformanceDatum,
     PerformanceDatumReplicate,
     PerformanceSignature,
-    PerformanceAlertSummary,
-    PerformanceAlert,
-    MultiCommitDatum,
-    BackfillReport,
 )
 
 

tests/model/cycle_data/test_treeherder_cycling.py

@@ -6,7 +6,7 @@
 
 from tests import test_utils
 from tests.autoclassify.utils import create_failure_lines, test_line
-from treeherder.model.models import Job, FailureLine, JobLog, JobType, Machine, JobGroup
+from treeherder.model.models import FailureLine, Job, JobGroup, JobLog, JobType, Machine
 from treeherder.perf.models import PerformanceDatum
 
 

tests/model/test_files_bugzilla_map.py

@@ -1,7 +1,7 @@
 import pytest
 
-from treeherder.model.models import BugzillaComponent, FilesBugzillaMap, Repository
 from treeherder.etl.files_bugzilla_map import FilesBugzillaMapProcess
+from treeherder.model.models import BugzillaComponent, FilesBugzillaMap, Repository
 
 EXPECTED_PROJECTS = [
     "mozilla-central",

tests/model/test_performance_tag.py

@@ -1,9 +1,8 @@
 import pytest
+from django.db.utils import IntegrityError
 
 from treeherder.perf.models import PerformanceTag
 
-from django.db.utils import IntegrityError
-
 
 def test_performance_tags_cannot_have_duplicate_names(transactional_db):
     PerformanceTag.objects.create(name="harness")

tests/perf/auto_perf_sheriffing/conftest.py

@@ -7,15 +7,19 @@
 import taskcluster
 from freezegun import freeze_time
 
-from tests.conftest import SampleDataJSONLoader, create_perf_signature, create_perf_alert
-from treeherder.model.models import MachinePlatform, Job, JobGroup, JobType
+from tests.conftest import (
+    SampleDataJSONLoader,
+    create_perf_alert,
+    create_perf_signature,
+)
+from treeherder.model.models import Job, JobGroup, JobType, MachinePlatform
 from treeherder.perf.auto_perf_sheriffing.secretary import Secretary
 from treeherder.perf.models import (
-    BackfillReport,
     BackfillRecord,
+    BackfillReport,
+    PerformanceAlert,
     PerformanceSettings,
     PerformanceSignature,
-    PerformanceAlert,
 )
 
 # For testing Sherlock

tests/perf/auto_perf_sheriffing/test_backfill_reports/conftest.py

@@ -7,9 +7,13 @@
 import pytest
 
 from tests.conftest import create_perf_alert
-from treeherder.model.models import Job, Option, OptionCollection, MachinePlatform
+from treeherder.model.models import Job, MachinePlatform, Option, OptionCollection
 from treeherder.perf.auto_perf_sheriffing.backfill_reports import AlertsPicker
-from treeherder.perf.models import PerformanceAlert, PerformanceDatum, PerformanceSignature
+from treeherder.perf.models import (
+    PerformanceAlert,
+    PerformanceDatum,
+    PerformanceSignature,
+)
 
 # For testing BackfillReportMaintainer
 LETTERS = string.ascii_lowercase

tests/perf/auto_perf_sheriffing/test_backfill_reports/test_backfill_report_maintainer.py

@@ -1,14 +1,10 @@
-import random
 import datetime
+import random
 
 from treeherder.perf.auto_perf_sheriffing.backfill_reports import (
     BackfillReportMaintainer,
 )
-from treeherder.perf.models import (
-    BackfillRecord,
-    BackfillReport,
-    PerformanceAlert,
-)
+from treeherder.perf.models import BackfillRecord, BackfillReport, PerformanceAlert
 
 EPOCH = datetime.datetime.utcfromtimestamp(0)
 

tests/perf/auto_perf_sheriffing/test_backfill_reports/test_identify_retriggerables.py

@@ -4,8 +4,11 @@
 
 import pytest
 
+from treeherder.perf.auto_perf_sheriffing.backfill_reports import (
+    IdentifyAlertRetriggerables,
+)
+
 from .conftest import NON_RETRIGGERABLE_JOB_ID, ONE_DAY_INTERVAL
-from treeherder.perf.auto_perf_sheriffing.backfill_reports import IdentifyAlertRetriggerables
 
 
 # Unit tests

tests/perf/auto_perf_sheriffing/test_report_backfill_outcome.py

@@ -1,12 +1,12 @@
 from datetime import datetime, timedelta
 
 import pytest
-from tests import settings as test_settings
 from django.core.management import call_command
 
+from tests import settings as test_settings
 from treeherder.perf.auto_perf_sheriffing.sherlock import Sherlock
-from treeherder.perf.models import BackfillNotificationRecord
 from treeherder.perf.exceptions import MaxRuntimeExceededError
+from treeherder.perf.models import BackfillNotificationRecord
 
 EPOCH = datetime.utcfromtimestamp(0)
 

tests/perf/auto_perf_sheriffing/test_secretary.py

@@ -3,14 +3,16 @@
 
 import pytest
 import simplejson as json
-
 from django.db.models import Q
 
 from treeherder.config.settings import IS_WINDOWS
-from treeherder.perf.auto_perf_sheriffing.secretary import Secretary
 from treeherder.model.models import Job, Push
+from treeherder.perf.auto_perf_sheriffing.outcome_checker import (
+    OutcomeChecker,
+    OutcomeStatus,
+)
+from treeherder.perf.auto_perf_sheriffing.secretary import Secretary
 from treeherder.perf.models import BackfillRecord, BackfillReport, PerformanceSettings
-from treeherder.perf.auto_perf_sheriffing.outcome_checker import OutcomeChecker, OutcomeStatus
 
 # we're testing against this (automatically provided by fixtures)
 JOB_TYPE_ID = 1

tests/perf/auto_perf_sheriffing/test_sherlock.py

@@ -1,11 +1,11 @@
 from datetime import datetime, timedelta
-import simplejson as json
 from json import JSONDecodeError
 
 import pytest
+import simplejson as json
 from django.db import models
-from tests import settings as test_settings
 
+from tests import settings as test_settings
 from tests.perf.auto_perf_sheriffing.conftest import prepare_record_with_search_str
 from treeherder.model.models import Job, Push
 from treeherder.perf.auto_perf_sheriffing.sherlock import Sherlock

tests/perf/auto_sheriffing_criteria/test_common_behaviour.py

@@ -1,20 +1,19 @@
+from collections.abc import Callable
 from datetime import datetime, timedelta
 
 import pytest
 from django.conf import settings
-from collections.abc import Callable
 
 from tests.perf.auto_sheriffing_criteria.conftest import CASSETTES_RECORDING_DATE
 from treeherder.config.settings import BZ_DATETIME_FORMAT
 from treeherder.perf.exceptions import NoFiledBugsError
 from treeherder.perf.sheriffing_criteria import (
+    BugzillaFormula,
     EngineerTractionFormula,
     FixRatioFormula,
-    BugzillaFormula,
     TotalAlertsFormula,
 )
 
-
 pytestmark = [pytest.mark.freeze_time(CASSETTES_RECORDING_DATE, tick=True)]
 
 

tests/perf/auto_sheriffing_criteria/test_criteria_tracker.py

@@ -4,21 +4,21 @@
 from dataclasses import replace
 from datetime import timedelta
 from itertools import chain
-from unittest.mock import MagicMock
-from dateutil.parser import parse as dateutil_parse
 from multiprocessing.pool import AsyncResult
+from unittest.mock import MagicMock
 
 import pytest
+from dateutil.parser import parse as dateutil_parse
 from freezegun import freeze_time
 
 from tests.perf.auto_sheriffing_criteria.conftest import CASSETTES_RECORDING_DATE
 from treeherder.perf.exceptions import NoFiledBugsError
 from treeherder.perf.sheriffing_criteria import (
+    CriteriaRecord,
     CriteriaTracker,
     EngineerTractionFormula,
     FixRatioFormula,
     RecordComputer,
-    CriteriaRecord,
     TotalAlertsFormula,
 )
 from treeherder.perf.sheriffing_criteria.criteria_tracking import ResultsChecker