style: pre-commit.ci auto fixes [...]

Author: pre-commit-ci[bot]

builddecisionscript/src/builddecisionscript/cron/__init__.py

@@ -110,9 +110,7 @@ def run(*, repository, branch, force_run, cron_input=None, dry_run):
             except Exception as exc:
                 failed_jobs.append((job_name, exc))
                 traceback.print_exc()
-                logger.error(
-                    f'cron job "{job_name}" run failed; continuing to next job'
-                )
+                logger.error(f'cron job "{job_name}" run failed; continuing to next job')
 
         else:
             logger.info(f'not running cron job "{job_name}"')
@@ -123,12 +121,9 @@ def run(*, repository, branch, force_run, cron_input=None, dry_run):
 def _format_and_raise_error_if_any(failed_jobs):
     if failed_jobs:
         failed_job_names = [job_name for job_name, _ in failed_jobs]
-        failed_job_names_with_exceptions = (
-            f'"{job_name}": "{exc}"' for job_name, exc in failed_jobs
-        )
+        failed_job_names_with_exceptions = (f'"{job_name}": "{exc}"' for job_name, exc in failed_jobs)
         raise RuntimeError(
-            "Cron jobs {} couldn't be triggered properly. "
-            "Reason(s):\n * {}\nSee logs above for details.".format(
+            "Cron jobs {} couldn't be triggered properly. Reason(s):\n * {}\nSee logs above for details.".format(
                 failed_job_names, "\n * ".join(failed_job_names_with_exceptions)
             )
         )

builddecisionscript/src/builddecisionscript/cron/decision.py

@@ -35,9 +35,7 @@ def run_decision_task(job_name, job, *, repository, push_info, cron_input=None,
     push_info = copy.deepcopy(push_info)
     push_info["owner"] = "cron"
 
-    taskcluster_yml = repository.get_file(
-        ".taskcluster.yml", revision=push_info["revision"]
-    )
+    taskcluster_yml = repository.get_file(".taskcluster.yml", revision=push_info["revision"])
 
     arguments = make_arguments(job)
 

builddecisionscript/src/builddecisionscript/cron/util.py

@@ -51,14 +51,10 @@ def calculate_time():
             time = datetime.datetime.utcfromtimestamp(int(os.environ["CRON_TIME"]))
             logger.info("cron time: %s", time)
         else:
-            logger.warning(
-                "using current time for time; try setting $CRON_TIME to a timestamp"
-            )
+            logger.warning("using current time for time; try setting $CRON_TIME to a timestamp")
             time = datetime.datetime.utcnow()
     else:
-        queue = taskcluster.Queue(
-            {"rootUrl": os.environ["TASKCLUSTER_PROXY_URL"]}, session=SESSION
-        )
+        queue = taskcluster.Queue({"rootUrl": os.environ["TASKCLUSTER_PROXY_URL"]}, session=SESSION)
         task = queue.task(os.environ["TASK_ID"])
         created = task["created"]
         time = datetime.datetime.strptime(created, "%Y-%m-%dT%H:%M:%S.%fZ")

builddecisionscript/src/builddecisionscript/decision.py

@@ -9,6 +9,7 @@
 import attr
 import jsone
 import slugid
+
 import taskcluster
 
 from .util.http import SESSION
@@ -56,7 +57,5 @@ def submit(self):
                 session=SESSION,
             )
         else:
-            queue = taskcluster.Queue(
-                taskcluster.optionsFromEnvironment(), session=SESSION
-            )
+            queue = taskcluster.Queue(taskcluster.optionsFromEnvironment(), session=SESSION)
         queue.createTask(self.task_id, self.task_payload)

builddecisionscript/src/builddecisionscript/repository.py

@@ -52,14 +52,9 @@ def get_file(self, path, *, revision=None):
                     headers["Authorization"] = f"token {self.github_token}"
                 headers["Accept"] = "application/vnd.github.raw+json"
             elif repo_url.startswith("git@github.com:"):
-                raise Exception(
-                    f"Don't know how to get file from private github repo: {repo_url}"
-                )
+                raise Exception(f"Don't know how to get file from private github repo: {repo_url}")
             else:
-                raise Exception(
-                    "Don't know how to determine get file for non-github "
-                    f"repo: {repo_url}"
-                )
+                raise Exception(f"Don't know how to determine get file for non-github repo: {repo_url}")
         else:
             raise Exception(f"Unknown repository_type {self.repository_type}!")
 
@@ -94,24 +89,16 @@ def get_push_info(self, *, revision=None, branch=None):
             res.raise_for_status()
             pushes = res.json()["pushes"]
             if len(pushes) == 0:
-                raise NoPushesError(
-                    f"Changeset {revset} has no associated pushes. "
-                    "Maybe the push log has not been updated?"
-                )
+                raise NoPushesError(f"Changeset {revset} has no associated pushes. Maybe the push log has not been updated?")
             elif len(pushes) != 1:
-                raise ValueError(
-                    f"Changeset {revset} has {len(pushes)} associated pushes; "
-                    "only one supported."
-                )
+                raise ValueError(f"Changeset {revset} has {len(pushes)} associated pushes; only one supported.")
             [(push_id, push_info)] = pushes.items()
             changesets = push_info["changesets"]
             first_pushed_revision = changesets[0]
             base_revision = first_pushed_revision["parents"][0]
             tip_revision = changesets[-1]["node"]
             if revision and revision != tip_revision:
-                raise ValueError(
-                    f"Changeset {revision} is not the tip {tip_revision} of the associated push."
-                )
+                raise ValueError(f"Changeset {revision} is not the tip {tip_revision} of the associated push.")
 
             return {
                 "owner": push_info["user"],
@@ -130,38 +117,25 @@ def get_push_info(self, *, revision=None, branch=None):
             if self.github_token:
                 headers["Authorization"] = f"token {self.github_token}"
             if repo_url.startswith("https://github.com/"):
-                url = (
-                    f"https://api.github.com"
-                    f"/repos/{self.repo_path}/git/ref/heads/{branch}"
-                )
+                url = f"https://api.github.com/repos/{self.repo_path}/git/ref/heads/{branch}"
                 res = SESSION.get(url, headers=headers, timeout=60)
                 res.raise_for_status()
                 return {
                     "branch": branch,
                     "revision": res.json()["object"]["sha"],
                 }
             elif repo_url.startswith("git@github.com:"):
-                raise Exception(
-                    "Don't know how to determine revision for private github "
-                    f"repo: {repo_url}"
-                )
+                raise Exception(f"Don't know how to determine revision for private github repo: {repo_url}")
             else:
-                raise Exception(
-                    "Don't know how to determine revision for non-github "
-                    f"repo: {repo_url}"
-                )
+                raise Exception(f"Don't know how to determine revision for non-github repo: {repo_url}")
         else:
             raise Exception(f"Unknown repository_type {self.repository_type}!")
 
     @property
     def repo_path(self):
-        if self.repository_type == "hg" and self.repo_url.startswith(
-            "https://hg.mozilla.org/"
-        ):
+        if self.repository_type == "hg" and self.repo_url.startswith("https://hg.mozilla.org/"):
             return self.repo_url.replace("https://hg.mozilla.org/", "", 1).rstrip("/")
-        elif self.repository_type == "git" and self.repo_url.startswith(
-            "https://github.com/"
-        ):
+        elif self.repository_type == "git" and self.repo_url.startswith("https://github.com/"):
             return self.repo_url.replace("https://github.com/", "", 1).rstrip("/")
         else:
             raise AttributeError(f"no repo_path available for {self.repo_url}")

builddecisionscript/src/builddecisionscript/script.py

@@ -75,9 +75,7 @@ def get_default_config(base_dir=None):
     return {
         "work_dir": os.path.join(base_dir, "work_dir"),
         "artifact_dir": os.path.join(base_dir, "artifact_dir"),
-        "schema_file": os.path.join(
-            os.path.dirname(__file__), "data", "builddecisionscript_task_schema.json"
-        ),
+        "schema_file": os.path.join(os.path.dirname(__file__), "data", "builddecisionscript_task_schema.json"),
     }
 
 

builddecisionscript/src/builddecisionscript/util/keyed_by.py

@@ -54,43 +54,28 @@ def evaluate_keyed_by(value, item_name, attributes):
             default: 12
     """
     while True:
-        if (
-            not isinstance(value, dict)
-            or len(value) != 1
-            or not list(value.keys())[0].startswith("by-")
-        ):
+        if not isinstance(value, dict) or len(value) != 1 or not list(value.keys())[0].startswith("by-"):
             return value
 
         keyed_by = list(value.keys())[0][3:]  # strip off 'by-' prefix
         key = attributes.get(keyed_by)
         alternatives = list(value.values())[0]
 
         if len(alternatives) == 1 and "default" in alternatives:
-            raise Exception(
-                f"Keyed-by '{keyed_by}' unnecessary with only value 'default' "
-                f"found, when determining item {item_name}"
-            )
+            raise Exception(f"Keyed-by '{keyed_by}' unnecessary with only value 'default' found, when determining item {item_name}")
 
         if key is None:
             if "default" in alternatives:
                 value = alternatives["default"]
                 continue
             else:
-                raise Exception(
-                    f"No attribute {keyed_by} and no value for 'default' found "
-                    f"while determining item {item_name}"
-                )
+                raise Exception(f"No attribute {keyed_by} and no value for 'default' found while determining item {item_name}")
 
         matches = keymatch(alternatives, key)
         if len(matches) > 1:
-            raise Exception(
-                f"Multiple matching values for {keyed_by} {key!r} found while "
-                f"determining item {item_name}"
-            )
+            raise Exception(f"Multiple matching values for {keyed_by} {key!r} found while determining item {item_name}")
         elif matches:
             value = matches[0]
             continue
 
-        raise Exception(
-            f"No {keyed_by} matching {key!r} nor 'default' found while determining item {item_name}"
-        )
+        raise Exception(f"No {keyed_by} matching {key!r} nor 'default' found while determining item {item_name}")

builddecisionscript/src/builddecisionscript/util/schema.py

@@ -22,9 +22,7 @@ class Schema:
     _schema = attr.ib()
     _validator = attr.ib(
         init=False,
-        default=attr.Factory(
-            lambda self: _get_validator(self._schema), takes_self=True
-        ),
+        default=attr.Factory(lambda self: _get_validator(self._schema), takes_self=True),
     )
 
     @classmethod

builddecisionscript/src/builddecisionscript/util/scopes.py

@@ -11,9 +11,7 @@ def satisfies(*, have, require):
     assert isinstance(require, list)
     for req_scope in require:
         for have_scope in have:
-            if have_scope == req_scope or (
-                have_scope.endswith("*") and req_scope.startswith(have_scope[:-1])
-            ):
+            if have_scope == req_scope or (have_scope.endswith("*") and req_scope.startswith(have_scope[:-1])):
                 break
         else:
             return False

builddecisionscript/src/builddecisionscript/util/trigger_action.py

@@ -18,6 +18,7 @@
 import attr
 import jsone
 import jsonschema
+
 import taskcluster
 
 from . import scopes
@@ -35,13 +36,7 @@ def _is_task_in_context(context, task_tags):
     a given task, if that task's tags match one of the tag-sets given
     in the context property for the action.
     """
-    return any(
-        all(
-            tag in task_tags and task_tags[tag] == tag_set[tag]
-            for tag in tag_set.keys()
-        )
-        for tag_set in context
-    )
+    return any(all(tag in task_tags and task_tags[tag] == tag_set[tag] for tag in tag_set.keys()) for tag_set in context)
 
 
 def _filter_relevant_actions(actions_json, original_task):
@@ -71,27 +66,22 @@ def _check_decision_task_scopes(decision_task_id, hook_group_id, hook_id):
     queue = taskcluster.Queue(taskcluster.optionsFromEnvironment(), session=SESSION)
     auth = taskcluster.Auth(taskcluster.optionsFromEnvironment(), session=SESSION)
     decision_task = queue.task(decision_task_id)
-    decision_task_scopes = auth.expandScopes({"scopes": decision_task["scopes"]})[
-        "scopes"
-    ]
+    decision_task_scopes = auth.expandScopes({"scopes": decision_task["scopes"]})["scopes"]
     in_tree_scope = f"in-tree:hook-action:{hook_group_id}/{hook_id}"
 
     if not scopes.satisfies(have=decision_task_scopes, require=[in_tree_scope]):
         raise RuntimeError(
             "Action is misconfigured: "
             f"decision task's scopes do not include {in_tree_scope}\n"
-            "Decision Task {decision_task_id} has scopes:\n"
-            + "\n".join(f"  - {scope}" for scope in decision_task_scopes)
+            "Decision Task {decision_task_id} has scopes:\n" + "\n".join(f"  - {scope}" for scope in decision_task_scopes)
         )
 
 
 def render_action(*, action_name, task_id, decision_task_id, action_input):
     queue = taskcluster.Queue(taskcluster.optionsFromEnvironment(), session=SESSION)
 
     logger.debug("Fetching actions.json...")
-    actions_url = queue.buildUrl(
-        "getLatestArtifact", decision_task_id, "public/actions.json"
-    )
+    actions_url = queue.buildUrl("getLatestArtifact", decision_task_id, "public/actions.json")
     actions_response = SESSION.get(actions_url)
     actions_response.raise_for_status()
     actions_json = actions_response.json()
@@ -106,17 +96,12 @@ def render_action(*, action_name, task_id, decision_task_id, action_input):
     relevant_actions = _filter_relevant_actions(actions_json, task_definition)
 
     if action_name not in relevant_actions:
-        raise LookupError(
-            f"{action_name} action is not available for this task. "
-            f"Available: {sorted(relevant_actions.keys())}"
-        )
+        raise LookupError(f"{action_name} action is not available for this task. Available: {sorted(relevant_actions.keys())}")
 
     action = relevant_actions[action_name]
 
     if action["kind"] != "hook":
-        raise NotImplementedError(
-            f"Unable to submit actions with '{action['kind']}' kind."
-        )
+        raise NotImplementedError(f"Unable to submit actions with '{action['kind']}' kind.")
 
     _check_decision_task_scopes(
         decision_task_id,
@@ -163,9 +148,7 @@ def submit(self):
                 session=SESSION,
             )
         else:
-            hooks = taskcluster.Hooks(
-                taskcluster.optionsFromEnvironment(), session=SESSION
-            )
+            hooks = taskcluster.Hooks(taskcluster.optionsFromEnvironment(), session=SESSION)
 
         logger.info("Triggering hook %s/%s", self.hook_group_id, self.hook_id)
         result = hooks.triggerHook(self.hook_group_id, self.hook_id, self.hook_payload)