From 302a92bde54abcd1cca0c36638b6f597bc347a47 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahal@pm.me>
Date: Thu, 19 Aug 2021 13:57:47 -0400
Subject: [PATCH 1/4] Update to latest taskgraph and decision-mobile image

See also RELENG-658.
---
 .taskcluster.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 290d2c936a..7a39b3ad54 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -10,7 +10,7 @@ tasks:
     - $let:
           taskgraph:
               branch: taskgraph
-              revision: 0c74426138739b1cad3bb4ff169af67eef6003fc
+              revision: 644b0b15ef3ac3888701b3e6c68e26137210dcbc
           trustDomain: app-services
       in:
           $let:
@@ -231,7 +231,7 @@ tasks:
                               # Note: This task is built server side without the context or tooling that
                               # exist in tree so we must hard code the hash
                               image:
-                                  mozillareleases/taskgraph:decision-mobile-6607973bc60e32323a541861cc5856cd6a0f51ea9fd664ef7d43bca8df53db47@sha256:8c471aacc469ea8e7bb4846c16efe086f7350a5cc1df570cc6c86b22895a2456
+                                  mozillareleases/taskgraph:decision-mobile-0e1cefb4ec46060d53bcd0eb2c0dd296210fa969998af468d693d1c6922efd1d@sha256:7cfb913bee636f1ab1477a09f8ad746e1f8c68fab0e2a3e1408c985d2ddc27f7
 
                               maxRunTime: 1800
 

From 37a02b246e9a70b0051c2018fcbbb35cf752743f Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahal@pm.me>
Date: Thu, 19 Aug 2021 14:03:15 -0400
Subject: [PATCH 2/4] Fixes #4393 - Run taskgraph generation with Python 3

See also RELENG-658.
---
 .taskcluster.yml                                              | 4 ++--
 taskcluster/app_services_taskgraph/__init__.py                | 4 ++--
 taskcluster/app_services_taskgraph/loader/__init__.py         | 4 ++--
 taskcluster/app_services_taskgraph/loader/multi_dep.py        | 4 ++--
 taskcluster/app_services_taskgraph/target_tasks.py            | 4 ++--
 taskcluster/app_services_taskgraph/transforms/module_build.py | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.taskcluster.yml b/.taskcluster.yml
index 7a39b3ad54..4323bd677d 100644
--- a/.taskcluster.yml
+++ b/.taskcluster.yml
@@ -244,8 +244,8 @@ tasks:
                                   - bash
                                   - -cx
                                   - >
-                                    PIP_IGNORE_INSTALLED=0 pip install --user /builds/worker/checkouts/taskgraph &&
-                                    PIP_IGNORE_INSTALLED=0 pip install --user arrow taskcluster pyyaml &&
+                                    PIP_IGNORE_INSTALLED=0 pip3 install --user /builds/worker/checkouts/taskgraph &&
+                                    PIP_IGNORE_INSTALLED=0 pip3 install --user arrow taskcluster pyyaml &&
                                     ln -s /builds/worker/artifacts artifacts &&
                                     ~/.local/bin/taskgraph decision
                                     --pushlog-id='0'
diff --git a/taskcluster/app_services_taskgraph/__init__.py b/taskcluster/app_services_taskgraph/__init__.py
index 3c85584b16..3b6244983d 100644
--- a/taskcluster/app_services_taskgraph/__init__.py
+++ b/taskcluster/app_services_taskgraph/__init__.py
@@ -32,7 +32,7 @@ def _import_modules(modules):
 
 def get_decision_parameters(graph_config, parameters):
     if parameters["tasks_for"] == "github-release":
-        head_tag = parameters["head_tag"].decode("utf-8")
+        head_tag = parameters["head_tag"]
         if not head_tag:
             raise ValueError(
                 "Cannot run github-release if `head_tag` is not defined. Got {}".format(
@@ -47,7 +47,7 @@ def get_decision_parameters(graph_config, parameters):
                 "{version} from buildconfig.yml".format(head_tag[1:], version)
             )
     elif parameters["tasks_for"] == "github-pull-request":
-        pr_title = os.environ.get("APPSERVICES_PULL_REQUEST_TITLE", "").decode("UTF-8")
+        pr_title = os.environ.get("APPSERVICES_PULL_REQUEST_TITLE", "")
         if "[ci full]" in pr_title:
             parameters["target_tasks_method"] = "pr-full"
         elif "[ci skip]" in pr_title:
diff --git a/taskcluster/app_services_taskgraph/loader/__init__.py b/taskcluster/app_services_taskgraph/loader/__init__.py
index cb8adbd326..2282d64d44 100644
--- a/taskcluster/app_services_taskgraph/loader/__init__.py
+++ b/taskcluster/app_services_taskgraph/loader/__init__.py
@@ -27,7 +27,7 @@ def group_tasks(config, tasks):
 
     groups = group_by_fn(config, tasks)
 
-    for combinations in groups.itervalues():
+    for combinations in groups.values():
         dependencies = [copy.deepcopy(t) for t in combinations]
         yield dependencies
 
@@ -50,7 +50,7 @@ def component_grouping(config, tasks):
         task for task in tasks
         if task.attributes.get("buildconfig", {}).get("name", "") == "all"
     ]
-    for _, tasks in groups.iteritems():
+    for _, tasks in groups.items():
         tasks.extend(copy.deepcopy(tasks_for_all_components))
 
     return groups
diff --git a/taskcluster/app_services_taskgraph/loader/multi_dep.py b/taskcluster/app_services_taskgraph/loader/multi_dep.py
index a969a8d58a..0d12d922e0 100644
--- a/taskcluster/app_services_taskgraph/loader/multi_dep.py
+++ b/taskcluster/app_services_taskgraph/loader/multi_dep.py
@@ -20,7 +20,7 @@
     Required(
         'dependent-tasks',
         'dictionary of dependent tasks, keyed by kind',
-    ): {basestring: Task},
+    ): {str: Task},
 })
 
 
@@ -67,7 +67,7 @@ def get_primary_dep(config, dep_tasks):
     is the primary dependency. If it's undefined, return the first dep.
     """
     primary_dependencies = config.get('primary-dependency')
-    if isinstance(primary_dependencies, basestring):
+    if isinstance(primary_dependencies, str):
         primary_dependencies = [primary_dependencies]
     if not primary_dependencies:
         assert len(dep_tasks) == 1, "Must define a primary-dependency!"
diff --git a/taskcluster/app_services_taskgraph/target_tasks.py b/taskcluster/app_services_taskgraph/target_tasks.py
index a1930d953a..2c6d977d03 100644
--- a/taskcluster/app_services_taskgraph/target_tasks.py
+++ b/taskcluster/app_services_taskgraph/target_tasks.py
@@ -20,7 +20,7 @@ def filter(task):
         return filter_for_tasks_for(task, parameters) \
             and task.attributes.get("run-on-pr-type", "all") in ("full-ci", "all")
 
-    return [l for l, task in full_task_graph.tasks.iteritems() if filter(task)]
+    return [l for l, task in full_task_graph.tasks.items() if filter(task)]
 
 
 @_target_task('pr-normal')
@@ -31,4 +31,4 @@ def filter(task):
         return filter_for_tasks_for(task, parameters) \
                 and task.attributes.get("run-on-pr-type", "all") in ("normal-ci", "all")
 
-    return [l for l, task in full_task_graph.tasks.iteritems() if filter(task)]
+    return [l for l, task in full_task_graph.tasks.items() if filter(task)]
diff --git a/taskcluster/app_services_taskgraph/transforms/module_build.py b/taskcluster/app_services_taskgraph/transforms/module_build.py
index f7f7d9fbe0..2a309dce74 100644
--- a/taskcluster/app_services_taskgraph/transforms/module_build.py
+++ b/taskcluster/app_services_taskgraph/transforms/module_build.py
@@ -19,7 +19,7 @@ def rustup_setup(config, tasks):
             [
                 "source",
                 "taskcluster/scripts/toolchain/rustup-setup.sh",
-                unicode(config.params["tasks_for"])
+                config.params["tasks_for"]
             ]
         )
         yield task
@@ -34,7 +34,7 @@ def release_upload_symbols(config, tasks):
                     [
                         "source",
                         "automation/upload_android_symbols.sh",
-                        unicode(task["attributes"]["buildconfig"]["path"])
+                        task["attributes"]["buildconfig"]["path"]
                     ]
                 )
 

From e2a2507090d416d2f3753136b2a325c51392d5bf Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahal@pm.me>
Date: Thu, 19 Aug 2021 14:05:26 -0400
Subject: [PATCH 3/4] Run 'pyupgrade --py36-plus' on taskcluster/ directory

---
 .../app_services_taskgraph/__init__.py        |  3 +--
 .../app_services_taskgraph/build_config.py    |  1 -
 taskcluster/app_services_taskgraph/job.py     | 25 +++++++++----------
 .../app_services_taskgraph/loader/__init__.py |  1 -
 .../loader/build_config.py                    |  1 -
 .../loader/multi_dep.py                       |  1 -
 .../app_services_taskgraph/target_tasks.py    |  1 -
 .../transforms/__init__.py                    |  7 +++---
 .../transforms/beetmover.py                   |  1 -
 .../transforms/module_build.py                |  9 +++----
 .../transforms/multi_dep.py                   |  1 -
 .../transforms/secrets.py                     |  1 -
 .../transforms/signing.py                     |  3 +--
 .../transforms/toolchain.py                   |  3 +--
 .../app_services_taskgraph/worker_types.py    | 25 +++++++++----------
 taskcluster/scripts/get-secret.py             |  3 +--
 taskcluster/scripts/write-dummy-secret.py     |  3 +--
 17 files changed, 36 insertions(+), 53 deletions(-)

diff --git a/taskcluster/app_services_taskgraph/__init__.py b/taskcluster/app_services_taskgraph/__init__.py
index 3b6244983d..1fd92e0efd 100644
--- a/taskcluster/app_services_taskgraph/__init__.py
+++ b/taskcluster/app_services_taskgraph/__init__.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from importlib import import_module
 import os
@@ -27,7 +26,7 @@ def register(graph_config):
 
 def _import_modules(modules):
     for module in modules:
-        import_module(".{}".format(module), package=__name__)
+        import_module(f".{module}", package=__name__)
 
 
 def get_decision_parameters(graph_config, parameters):
diff --git a/taskcluster/app_services_taskgraph/build_config.py b/taskcluster/app_services_taskgraph/build_config.py
index fadb347c79..a4fae78c03 100644
--- a/taskcluster/app_services_taskgraph/build_config.py
+++ b/taskcluster/app_services_taskgraph/build_config.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import yaml
diff --git a/taskcluster/app_services_taskgraph/job.py b/taskcluster/app_services_taskgraph/job.py
index 567cfa0873..293341fab9 100644
--- a/taskcluster/app_services_taskgraph/job.py
+++ b/taskcluster/app_services_taskgraph/job.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.job import run_job_using, configure_taskdesc_for_run
 from taskgraph.util import path
@@ -13,25 +12,25 @@
 from pipes import quote as shell_quote
 
 secret_schema = {
-    Required("name"): text_type,
-    Required("path"): text_type,
-    Required("key"): text_type,
+    Required("name"): str,
+    Required("path"): str,
+    Required("key"): str,
     Optional("json"): bool,
 }
 
 dummy_secret_schema = {
-    Required("content"): text_type,
-    Required("path"): text_type,
+    Required("content"): str,
+    Required("path"): str,
     Optional("json"): bool,
 }
 
 gradlew_schema = Schema({
     Required("using"): "gradlew",
-    Optional("pre-gradlew"): [[text_type]],
-    Required("gradlew"): [text_type],
-    Optional("post-gradlew"): [[text_type]],
+    Optional("pre-gradlew"): [[str]],
+    Required("gradlew"): [str],
+    Optional("post-gradlew"): [[str]],
     # Base work directory used to set up the task.
-    Required("workdir"): text_type,
+    Required("workdir"): str,
     Optional("use-caches"): bool,
     Optional("secrets"): [secret_schema],
     Optional("dummy-secrets"): [dummy_secret_schema],
@@ -39,9 +38,9 @@
 
 run_commands_schema = Schema({
     Required("using"): "run-commands",
-    Optional("pre-commands"): [[text_type]],
+    Optional("pre-commands"): [[str]],
     Required("commands"): [[taskref_or_string]],
-    Required("workdir"): text_type,
+    Required("workdir"): str,
     Optional("use-caches"): bool,
     Optional("secrets"): [secret_schema],
     Optional("dummy-secrets"): [dummy_secret_schema],
@@ -145,7 +144,7 @@ def _convert_commands_to_string(commands):
                     part_string = part["task-reference"]
                     should_task_reference = True
                 else:
-                    raise ValueError('Unsupported dict: {}'.format(part))
+                    raise ValueError(f'Unsupported dict: {part}')
             else:
                 part_string = part
 
diff --git a/taskcluster/app_services_taskgraph/loader/__init__.py b/taskcluster/app_services_taskgraph/loader/__init__.py
index 2282d64d44..f2fa189485 100644
--- a/taskcluster/app_services_taskgraph/loader/__init__.py
+++ b/taskcluster/app_services_taskgraph/loader/__init__.py
@@ -6,7 +6,6 @@
 # charge of taking every task in the kind, applying job-defaults and
 # finding what are the right upstream dependencies
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import copy
 
diff --git a/taskcluster/app_services_taskgraph/loader/build_config.py b/taskcluster/app_services_taskgraph/loader/build_config.py
index e324738cec..2aa432203d 100644
--- a/taskcluster/app_services_taskgraph/loader/build_config.py
+++ b/taskcluster/app_services_taskgraph/loader/build_config.py
@@ -5,7 +5,6 @@
 # XXX: This loader generates a new build task for every component defined in
 # `.buildconfig-android.yml`
 
-from __future__ import print_function, unicode_literals
 
 import os
 
diff --git a/taskcluster/app_services_taskgraph/loader/multi_dep.py b/taskcluster/app_services_taskgraph/loader/multi_dep.py
index 0d12d922e0..9f16c8bc97 100644
--- a/taskcluster/app_services_taskgraph/loader/multi_dep.py
+++ b/taskcluster/app_services_taskgraph/loader/multi_dep.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import copy
 
diff --git a/taskcluster/app_services_taskgraph/target_tasks.py b/taskcluster/app_services_taskgraph/target_tasks.py
index 2c6d977d03..8bc81f3bdf 100644
--- a/taskcluster/app_services_taskgraph/target_tasks.py
+++ b/taskcluster/app_services_taskgraph/target_tasks.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.target_tasks import _target_task, filter_for_tasks_for
 
diff --git a/taskcluster/app_services_taskgraph/transforms/__init__.py b/taskcluster/app_services_taskgraph/transforms/__init__.py
index a65db14de0..f3d497a717 100644
--- a/taskcluster/app_services_taskgraph/transforms/__init__.py
+++ b/taskcluster/app_services_taskgraph/transforms/__init__.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from ..build_config import EXTENSIONS
 
@@ -12,7 +11,7 @@ def _extensions(type, secondary_extensions):
 
 
 def _artifact_filename(name, version, extension):
-    return "{}-{}{}".format(name, version, extension)
+    return f"{name}-{version}{extension}"
 
 
 def publications_to_artifact_paths(name, version, publications, secondary_extensions=("",)):
@@ -20,7 +19,7 @@ def publications_to_artifact_paths(name, version, publications, secondary_extens
     for publication in publications:
         for extension in _extensions(publication["type"], secondary_extensions):
             artifact_filename = _artifact_filename(publication['name'], version, extension)
-            paths.append("public/build/{}".format(artifact_filename))
+            paths.append(f"public/build/{artifact_filename}")
 
     return paths
 
@@ -30,7 +29,7 @@ def publications_to_artifact_map_paths(name, version, publications, secondary_ex
     for publication in publications:
         for extension in _extensions(publication["type"], secondary_extensions):
             artifact_filename = _artifact_filename(publication['name'], version, extension)
-            build_map_paths["public/build/{}".format(artifact_filename)] = {
+            build_map_paths[f"public/build/{artifact_filename}"] = {
                 "checksums_path": "",  # XXX beetmover marks this as required, but it's not needed
                 "destinations": ["maven2/org/mozilla/appservices/{}/{}/{}".format(publication['name'], version, artifact_filename)]
             }
diff --git a/taskcluster/app_services_taskgraph/transforms/beetmover.py b/taskcluster/app_services_taskgraph/transforms/beetmover.py
index ec6b90bd9f..d491961a89 100644
--- a/taskcluster/app_services_taskgraph/transforms/beetmover.py
+++ b/taskcluster/app_services_taskgraph/transforms/beetmover.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.schema import resolve_keyed_by
diff --git a/taskcluster/app_services_taskgraph/transforms/module_build.py b/taskcluster/app_services_taskgraph/transforms/module_build.py
index 2a309dce74..d089152921 100644
--- a/taskcluster/app_services_taskgraph/transforms/module_build.py
+++ b/taskcluster/app_services_taskgraph/transforms/module_build.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 
@@ -27,7 +26,7 @@ def rustup_setup(config, tasks):
 @transforms.add
 def release_upload_symbols(config, tasks):
     for task in tasks:
-        if (config.params["tasks_for"] == u"github-release" and
+        if (config.params["tasks_for"] == "github-release" and
             task["attributes"]["buildconfig"]["uploadSymbols"]):
                 task["run"].setdefault("post-gradlew", [])
                 task["run"]["post-gradlew"].append(
@@ -56,10 +55,10 @@ def build_task(config, tasks):
         all_extensions = get_extensions(name)
         for publication_name, extensions in all_extensions.items():
             for extension in extensions:
-                artifact_filename = "{}-{}{}".format(publication_name, version, extension)
+                artifact_filename = f"{publication_name}-{version}{extension}"
                 artifacts.append({
-                    "name": "public/build/{}".format(artifact_filename),
-                    "path": "/builds/worker/checkouts/src/build/maven/org/mozilla/appservices/{}/{}/{}".format(publication_name, version, artifact_filename),
+                    "name": f"public/build/{artifact_filename}",
+                    "path": f"/builds/worker/checkouts/src/build/maven/org/mozilla/appservices/{publication_name}/{version}/{artifact_filename}",
                     "type": "file",
                 })
 
diff --git a/taskcluster/app_services_taskgraph/transforms/multi_dep.py b/taskcluster/app_services_taskgraph/transforms/multi_dep.py
index 817e8d26d8..714cb99f23 100644
--- a/taskcluster/app_services_taskgraph/transforms/multi_dep.py
+++ b/taskcluster/app_services_taskgraph/transforms/multi_dep.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 
diff --git a/taskcluster/app_services_taskgraph/transforms/secrets.py b/taskcluster/app_services_taskgraph/transforms/secrets.py
index 2e4167727c..7c39a2453f 100644
--- a/taskcluster/app_services_taskgraph/transforms/secrets.py
+++ b/taskcluster/app_services_taskgraph/transforms/secrets.py
@@ -5,7 +5,6 @@
 Resolve secrets and dummy secrets
 """
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.schema import resolve_keyed_by
diff --git a/taskcluster/app_services_taskgraph/transforms/signing.py b/taskcluster/app_services_taskgraph/transforms/signing.py
index 0f8155d588..632227cb96 100644
--- a/taskcluster/app_services_taskgraph/transforms/signing.py
+++ b/taskcluster/app_services_taskgraph/transforms/signing.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.schema import resolve_keyed_by
@@ -22,7 +21,7 @@ def build_upstream_artifacts(config, tasks):
         version = get_version()
 
         worker_definition = {"upstream-artifacts": [{
-            "taskId": {"task-reference": "<{}>".format(dep.kind)},
+            "taskId": {"task-reference": f"<{dep.kind}>"},
             "taskType": "build",
             "paths": publications_to_artifact_paths(name, version, module_info["publications"]),
             "formats": ["autograph_gpg"],
diff --git a/taskcluster/app_services_taskgraph/transforms/toolchain.py b/taskcluster/app_services_taskgraph/transforms/toolchain.py
index 3c2f837ab7..422cd0aab6 100644
--- a/taskcluster/app_services_taskgraph/transforms/toolchain.py
+++ b/taskcluster/app_services_taskgraph/transforms/toolchain.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import subprocess
 
@@ -24,7 +23,7 @@
 
 @memoize
 def git_sha_for_directory(directory):
-    output = subprocess.check_output(["git", "rev-parse", "HEAD:{}".format(directory)])
+    output = subprocess.check_output(["git", "rev-parse", f"HEAD:{directory}"])
     sha = output.decode("utf8").strip()
     return sha
 
diff --git a/taskcluster/app_services_taskgraph/worker_types.py b/taskcluster/app_services_taskgraph/worker_types.py
index 8d902429fb..45f292bc83 100644
--- a/taskcluster/app_services_taskgraph/worker_types.py
+++ b/taskcluster/app_services_taskgraph/worker_types.py
@@ -2,7 +2,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from six import text_type
 
@@ -16,12 +15,12 @@
     "scriptworker-signing",
     schema={
         Required("max-run-time"): int,
-        Required("cert"): text_type,
+        Required("cert"): str,
         Required("upstream-artifacts"): [{
             Required("taskId"): taskref_or_string,
-            Required("taskType"): text_type,
-            Required("paths"): [text_type],
-            Required("formats"): [text_type],
+            Required("taskType"): str,
+            Required("paths"): [str],
+            Required("formats"): [str],
         }]
     }
 )
@@ -42,26 +41,26 @@ def build_scriptworker_signing_payload(config, task, task_def):
         "{}:signing:cert:{}".format(scope_prefix, worker["cert"])
     )
     task_def["scopes"].extend([
-        "{}:signing:format:{}".format(scope_prefix, signing_format) for signing_format in sorted(formats)
+        f"{scope_prefix}:signing:format:{signing_format}" for signing_format in sorted(formats)
     ])
 
 
 @payload_builder(
     "scriptworker-beetmover",
     schema={
-        Required("bucket"): text_type,
+        Required("bucket"): str,
         Required("max-run-time"): int,
         Required("version"): str,
-        Required("app-name"): text_type,
+        Required("app-name"): str,
         Required("upstream-artifacts"): [{
             Required("taskId"): taskref_or_string,
-            Required("taskType"): text_type,
-            Required("paths"): [text_type],
+            Required("taskType"): str,
+            Required("paths"): [str],
         }],
         Required("artifact-map"): [{
             Required("task-id"): taskref_or_string,
-            Required("locale"): text_type,
-            Required("paths"): {text_type: dict},
+            Required("locale"): str,
+            Required("paths"): {str: dict},
         }],
     }
 )
@@ -87,6 +86,6 @@ def build_scriptworker_beetmover_payload(config, task, task_def):
         "{}:beetmover:bucket:{}".format(scope_prefix, worker["bucket"])
     )
     task_def["scopes"].append(
-        "{}:beetmover:action:push-to-maven".format(scope_prefix)
+        f"{scope_prefix}:beetmover:action:push-to-maven"
     )
 
diff --git a/taskcluster/scripts/get-secret.py b/taskcluster/scripts/get-secret.py
index 90e559a0d4..195b55e37e 100755
--- a/taskcluster/scripts/get-secret.py
+++ b/taskcluster/scripts/get-secret.py
@@ -4,7 +4,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import argparse
 import base64
@@ -21,7 +20,7 @@ def write_secret_to_file(path, data, key, base64decode=False, json_secret=False,
     except OSError as error:
         if error.errno != errno.EEXIST:
             raise
-    print("Outputting secret to: {}".format(path))
+    print(f"Outputting secret to: {path}")
 
     with open(path, 'a' if append else 'w') as f:
         value = data['secret'][key]
diff --git a/taskcluster/scripts/write-dummy-secret.py b/taskcluster/scripts/write-dummy-secret.py
index b4a2bcfd67..c59de01c48 100755
--- a/taskcluster/scripts/write-dummy-secret.py
+++ b/taskcluster/scripts/write-dummy-secret.py
@@ -4,7 +4,6 @@
 # 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/.
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import argparse
 import errno
@@ -18,7 +17,7 @@ def write_secret_to_file(path, secret):
     except OSError as error:
         if error.errno != errno.EEXIST:
             raise
-    print("Outputting secret to: {}".format(path))
+    print(f"Outputting secret to: {path}")
 
     with open(path, 'w') as f:
         f.write(secret)

From e109700618bdc5aa0df92aaed7b38a151448e909 Mon Sep 17 00:00:00 2001
From: Andrew Halberstadt <ahal@pm.me>
Date: Thu, 19 Aug 2021 14:06:12 -0400
Subject: [PATCH 4/4] Remove unused imports from taskcluster/ directory

---
 taskcluster/app_services_taskgraph/__init__.py            | 2 --
 taskcluster/app_services_taskgraph/job.py                 | 2 --
 taskcluster/app_services_taskgraph/loader/build_config.py | 2 --
 taskcluster/app_services_taskgraph/loader/multi_dep.py    | 1 -
 taskcluster/app_services_taskgraph/worker_types.py        | 1 -
 5 files changed, 8 deletions(-)

diff --git a/taskcluster/app_services_taskgraph/__init__.py b/taskcluster/app_services_taskgraph/__init__.py
index 1fd92e0efd..b17255aef6 100644
--- a/taskcluster/app_services_taskgraph/__init__.py
+++ b/taskcluster/app_services_taskgraph/__init__.py
@@ -6,8 +6,6 @@
 from importlib import import_module
 import os
 
-from six import text_type
-from voluptuous import Required, Any
 
 from .build_config import get_version
 
diff --git a/taskcluster/app_services_taskgraph/job.py b/taskcluster/app_services_taskgraph/job.py
index 293341fab9..0c420524aa 100644
--- a/taskcluster/app_services_taskgraph/job.py
+++ b/taskcluster/app_services_taskgraph/job.py
@@ -4,10 +4,8 @@
 
 
 from taskgraph.transforms.job import run_job_using, configure_taskdesc_for_run
-from taskgraph.util import path
 from taskgraph.util.schema import Schema, taskref_or_string
 from voluptuous import Required, Optional
-from six import text_type
 
 from pipes import quote as shell_quote
 
diff --git a/taskcluster/app_services_taskgraph/loader/build_config.py b/taskcluster/app_services_taskgraph/loader/build_config.py
index 2aa432203d..4c918e181d 100644
--- a/taskcluster/app_services_taskgraph/loader/build_config.py
+++ b/taskcluster/app_services_taskgraph/loader/build_config.py
@@ -6,9 +6,7 @@
 # `.buildconfig-android.yml`
 
 
-import os
 
-from copy import deepcopy
 from taskgraph.loader.transform import loader as base_loader
 
 from ..build_config import get_components
diff --git a/taskcluster/app_services_taskgraph/loader/multi_dep.py b/taskcluster/app_services_taskgraph/loader/multi_dep.py
index 9f16c8bc97..ccb6f09a49 100644
--- a/taskcluster/app_services_taskgraph/loader/multi_dep.py
+++ b/taskcluster/app_services_taskgraph/loader/multi_dep.py
@@ -8,7 +8,6 @@
 from voluptuous import Required
 
 from taskgraph.task import Task
-from taskgraph.util.attributes import sorted_unique_list
 from taskgraph.util.schema import Schema
 
 from . import group_tasks
diff --git a/taskcluster/app_services_taskgraph/worker_types.py b/taskcluster/app_services_taskgraph/worker_types.py
index 45f292bc83..0e4f61b9fd 100644
--- a/taskcluster/app_services_taskgraph/worker_types.py
+++ b/taskcluster/app_services_taskgraph/worker_types.py
@@ -3,7 +3,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 
-from six import text_type
 
 from voluptuous import Required