Bug 1825116 - android_taskgraph: ruff fixes. r=gabriel,releng-reviewers

Generated with:
`./mach lint -l ruff --fix taskcluster/android_taskgraph`

Differential Revision: https://phabricator.services.mozilla.com/D201458

taskcluster/android_taskgraph/build_config.py

@@ -6,9 +6,10 @@
 import os
 
 import yaml
-from android_taskgraph import ANDROID_COMPONENTS_DIR, FENIX_DIR, FOCUS_DIR, PROJECT_DIR
 from taskgraph.util.memoize import memoize
 
+from android_taskgraph import ANDROID_COMPONENTS_DIR, FENIX_DIR, FOCUS_DIR
+
 EXTENSIONS = {
     "aar": (".aar", ".pom", "-sources.jar"),
     "jar": (".jar", ".pom", "-sources.jar"),

taskcluster/android_taskgraph/parameters.py

@@ -2,10 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-import os
 
 from gecko_taskgraph.parameters import extend_parameters_schema
-from voluptuous import All, Any, Range, Required
+from voluptuous import Any, Required
 
 
 def get_defaults(repo_root):

taskcluster/android_taskgraph/target_tasks.py

@@ -4,11 +4,12 @@
 
 import os
 
-from android_taskgraph.release_type import does_task_match_release_type
 from redo import retry
 from taskgraph.target_tasks import _target_task
 from taskgraph.util.taskcluster import find_task_id
 
+from android_taskgraph.release_type import does_task_match_release_type
+
 
 def index_exists(index_path, reason=""):
     print(f"Looking for existing index {index_path} {reason}...")

taskcluster/android_taskgraph/transforms/beetmover_android_app.py

@@ -7,12 +7,13 @@ Transform the beetmover task into an actual task description.
 
 import logging
 
-from android_taskgraph.util.scriptworker import generate_beetmover_artifact_map
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.transforms.task import task_description_schema
 from taskgraph.util.schema import optionally_keyed_by, resolve_keyed_by
 from voluptuous import ALLOW_EXTRA, Optional, Required, Schema
 
+from android_taskgraph.util.scriptworker import generate_beetmover_artifact_map
+
 logger = logging.getLogger(__name__)
 
 beetmover_description_schema = Schema(
@@ -57,7 +58,7 @@ def make_task_description(config, tasks):
         )
         bucket_scope = task.pop("bucket-scope")
 
-        task = {
+        taskdesc = {
             "label": label,
             "description": description,
             "worker-type": "beetmover-android",
@@ -71,7 +72,7 @@ def make_task_description(config, tasks):
             "treeherder": task["treeherder"],
         }
 
-        yield task
+        yield taskdesc
 
 
 _STAGING_PREFIX = "staging-"

taskcluster/android_taskgraph/transforms/build_android_app.py

@@ -7,10 +7,11 @@ build-apk and build-bundle kinds.
 """
 
 
-from android_taskgraph.build_config import get_variant
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util import path
 
+from android_taskgraph.build_config import get_variant
+
 transforms = TransformSequence()
 
 

taskcluster/android_taskgraph/transforms/build_components.py

@@ -127,7 +127,7 @@ def set_external_gradle_dependencies(config, tasks):
 
 @transforms.add
 def add_artifacts(config, tasks):
-    timestamp = _get_timestamp(config)
+    _get_timestamp(config)
     version = config.params["version"]
     nightly_version = get_nightly_version(config, version)
 

taskcluster/android_taskgraph/transforms/signing.py

@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
+from gecko_taskgraph.util.scriptworker import get_signing_cert_scope
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.schema import resolve_keyed_by
-from gecko_taskgraph.util.scriptworker import get_signing_cert_scope
 
 from ..build_config import CHECKSUMS_EXTENSIONS
 

taskcluster/android_taskgraph/util/scriptworker.py

@@ -220,7 +220,6 @@ def generate_beetmover_artifact_map(config, job, **kwargs):
                 "{s3_bucket_path}/{dest_path}/{filename}".format(
                     s3_bucket_path=bucket_path,
                     dest_path=dest_path,
-                    locale_prefix=file_config["locale_prefix"],
                     filename=file_config.get("pretty_name", filename),
                 )
                 for dest_path, bucket_path in itertools.product(