taskcluster-taskgraph 6.3.1__tar.gz → 7.0.0__tar.gz

{taskcluster-taskgraph-6.3.1/src/taskcluster_taskgraph.egg-info → taskcluster-taskgraph-7.0.0}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 6.3.1
+Version: 7.0.0
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/README.rst

@@ -68,7 +68,7 @@ CI`_.
 Installation
 ------------
 
-Taskgraph supports Python 3.7 and up, and can be installed from Pypi:
+Taskgraph supports Python 3.8 and up, and can be installed from Pypi:
 
 .. code-block::
 

taskcluster-taskgraph-7.0.0/pyproject.toml

@@ -0,0 +1,61 @@
+[tool.black]
+line-length = 88
+extend-exclude = """(\
+  taskcluster/scripts/external_tools)\
+  """
+
+[tool.pytest.ini_options]
+xfail_strict = true
+
+[tool.coverage.run]
+parallel = true
+branch = true
+source = ["src/taskgraph/", "taskgraph", "src/taskgraph/run-task/"]
+
+[tool.ruff]
+select = [
+    "E", "W",       # pycodestyle
+    "F",            # pyflakes
+    "I",            # isort
+    "PLC", "PLE",   # pylint
+    "UP",           # pyupgrade
+]
+ignore = [
+    "E402",
+    "E501",  # let black handle line-length
+    "E741",
+]
+target-version = "py38"
+
+[tool.ruff.isort]
+known-first-party = ["taskgraph"]
+
+[tool.pyright]
+include = ["src"]
+exclude = [  # TODO fix errors in these files
+    "src/taskgraph/decision.py",
+    "src/taskgraph/docker.py",
+    "src/taskgraph/files_changed.py",
+    "src/taskgraph/generator.py",
+    "src/taskgraph/graph.py",
+    "src/taskgraph/main.py",
+    "src/taskgraph/morph.py",
+    "src/taskgraph/parameters.py",
+    "src/taskgraph/taskgraph.py",
+    "src/taskgraph/actions/cancel.py",
+    "src/taskgraph/actions/cancel_all.py",
+    "src/taskgraph/actions/rebuild_cached_tasks.py",
+    "src/taskgraph/actions/util.py",
+    "src/taskgraph/optimize/base.py",
+    "src/taskgraph/run-task/robustcheckout.py",
+    "src/taskgraph/transforms/fetch.py",
+    "src/taskgraph/transforms/task.py",
+    "src/taskgraph/transforms/run/run_task.py",
+    "src/taskgraph/util/cached_tasks.py",
+    "src/taskgraph/util/decision.py",
+    "src/taskgraph/util/python_path.py",
+    "src/taskgraph/util/schema.py",
+    "src/taskgraph/util/taskcluster.py",
+    "src/taskgraph/util/vcs.py",
+    "src/taskgraph/util/workertypes.py",
+]

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/requirements/base.txt

@@ -118,10 +118,6 @@ idna==3.4 \
     --hash=sha256:814f528e8dead7d329833b91c5faa87d60bf71824cd12a7530b5526063d02cb4 \
     --hash=sha256:90b77e79eaa3eba6de819a0c442c0b4ceefc341a7a2ab77d7562bf49f425c5c2
     # via requests
-importlib-metadata==6.6.0 \
-    --hash=sha256:43dd286a2cd8995d5eaef7fee2066340423b818ed3fd70adf0bad5f1fac53fed \
-    --hash=sha256:92501cdf9cc66ebd3e612f1b4f0c0765dfa42f0fa38ffb319b6bd84dd675d705
-    # via click
 jinja2==3.1.2 \
     --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \
     --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61
@@ -271,12 +267,6 @@ text-unidecode==1.3 \
     --hash=sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8 \
     --hash=sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93
     # via python-slugify
-typing-extensions==4.6.3 \
-    --hash=sha256:88a4153d8505aabbb4e13aacb7c486c2b4a33ca3b3f807914a9b4c844c471c26 \
-    --hash=sha256:d91d5919357fe7f681a9f2b5b4cb2a5f1ef0a1e9f59c4d8ff0d3491e05c0ffd5
-    # via
-    #   arrow
-    #   importlib-metadata
 urllib3==2.0.3 \
     --hash=sha256:48e7fafa40319d358848e1bc6809b208340fafe2096f1725d05d67443d0483d1 \
     --hash=sha256:bee28b5e56addb8226c96f7f13ac28cb4c301dd5ea8a6ca179c0b9835e032825
@@ -285,7 +275,3 @@ voluptuous==0.13.1 \
     --hash=sha256:4b838b185f5951f2d6e8752b68fcf18bd7a9c26ded8f143f92d6d28f3921a3e6 \
     --hash=sha256:e8d31c20601d6773cb14d4c0f42aee29c6821bbd1018039aac7ac5605b489723
     # via -r requirements/base.in
-zipp==3.15.0 \
-    --hash=sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b \
-    --hash=sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556
-    # via importlib-metadata

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/requirements/dev.txt

@@ -14,17 +14,9 @@ identify==2.5.24 \
     --hash=sha256:0aac67d5b4812498056d28a9a512a483f5085cc28640b02b258a59dac34301d4 \
     --hash=sha256:986dbfb38b1140e763e413e6feb44cd731faf72d1909543178aa79b0e258265d
     # via pre-commit
-nodeenv==1.8.0 \
-    --hash=sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2 \
-    --hash=sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec
-    # via pre-commit
 pre-commit==2.21.0 \
     --hash=sha256:31ef31af7e474a8d8995027fefdfcf509b5c913ff31f2015b4ec4beb26a6f658 \
     --hash=sha256:e2f91727039fc39a92f58a588a25b87f936de6567eed4f0e673e0507edc75bad
     # via -r requirements/dev.in
 
 # The following packages are considered to be unsafe in a requirements file:
-setuptools==67.8.0 \
-    --hash=sha256:5df61bf30bb10c6f756eb19e7c9f3b473051f48db77fddbe06ff2ca307df9a6f \
-    --hash=sha256:62642358adc77ffa87233bc4d2354c4b2682d214048f500964dbe760ccedf102
-    # via nodeenv

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/requirements/test.in

@@ -1,6 +1,7 @@
 -r base.in
 coverage
 mock
+pyright
 pytest
 pytest-mock
 responses

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/requirements/test.txt

@@ -1,4 +1,4 @@
-# SHA1:0cbb82cbf14365738df0c1100a54f7ee5e312452
+# SHA1:e6344ef3b0b270eae651e48034a25b9d9e8faa4a
 #
 # This file is autogenerated by pip-compile-multi
 # To update, run:
@@ -98,6 +98,10 @@ mock==5.0.2 \
     --hash=sha256:06f18d7d65b44428202b145a9a36e99c2ee00d1eb992df0caf881d4664377891 \
     --hash=sha256:0e0bc5ba78b8db3667ad636d964eb963dc97a59f04c6f6214c5f0e4a8f726c56
     # via -r requirements/test.in
+nodeenv==1.8.0 \
+    --hash=sha256:d51e0c37e64fbf47d017feac3145cdbb58836d7eee8c6f6d3b6880c5456227d2 \
+    --hash=sha256:df865724bb3c3adc86b3876fa209771517b0cfe596beff01a92700e0e8be4cec
+    # via pyright
 packaging==23.1 \
     --hash=sha256:994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61 \
     --hash=sha256:a392980d2b6cffa644431898be54b0045151319d1e7ec34f0cfed48767dd334f
@@ -121,6 +125,10 @@ pyproject-api==1.5.1 \
     --hash=sha256:435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9 \
     --hash=sha256:4698a3777c2e0f6b624f8a4599131e2a25376d90fe8d146d7ac74c67c6f97c43
     # via tox
+pyright==1.1.337 \
+    --hash=sha256:81d81f839d1750385390c4c4a7b84b062ece2f9a078f87055d4d2a5914ef2a08 \
+    --hash=sha256:8cbd4ef71797258f816a8393a758c9c91213479f472082d0e3a735ef7ab5f65a
+    # via -r requirements/test.in
 pytest==7.3.1 \
     --hash=sha256:3799fa815351fea3a5e96ac7e503a96fa51cc9942c3753cda7651b93c1cfa362 \
     --hash=sha256:434afafd78b1d78ed0addf160ad2b77a30d35d4bdf8af234fe621919d9ed15e3
@@ -154,3 +162,9 @@ virtualenv==20.23.0 \
     --hash=sha256:6abec7670e5802a528357fdc75b26b9f57d5d92f29c5462ba0fbe45feacc685e \
     --hash=sha256:a85caa554ced0c0afbd0d638e7e2d7b5f92d23478d05d17a76daeac8f279f924
     # via tox
+
+# The following packages are considered to be unsafe in a requirements file:
+setuptools==68.0.0 \
+    --hash=sha256:11e52c67415a381d10d6b462ced9cfb97066179f0e871399e006c4ab101fc85f \
+    --hash=sha256:baf1fdb41c6da4cd2eae722e135500da913332ab3f2f5c7d33af9b492acb5235
+    # via nodeenv

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/setup.py

@@ -28,7 +28,6 @@ setup(
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0/src/taskcluster_taskgraph.egg-info}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 6.3.1
+Version: 7.0.0
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskcluster_taskgraph.egg-info/SOURCES.txt

@@ -59,16 +59,15 @@ src/taskgraph/transforms/from_deps.py
 src/taskgraph/transforms/notify.py
 src/taskgraph/transforms/task.py
 src/taskgraph/transforms/task_context.py
-src/taskgraph/transforms/job/__init__.py
-src/taskgraph/transforms/job/common.py
-src/taskgraph/transforms/job/index_search.py
-src/taskgraph/transforms/job/run_task.py
-src/taskgraph/transforms/job/toolchain.py
+src/taskgraph/transforms/run/__init__.py
+src/taskgraph/transforms/run/common.py
+src/taskgraph/transforms/run/index_search.py
+src/taskgraph/transforms/run/run_task.py
+src/taskgraph/transforms/run/toolchain.py
 src/taskgraph/util/__init__.py
 src/taskgraph/util/archive.py
 src/taskgraph/util/attributes.py
 src/taskgraph/util/cached_tasks.py
-src/taskgraph/util/decision.py
 src/taskgraph/util/dependencies.py
 src/taskgraph/util/docker.py
 src/taskgraph/util/hash.py
@@ -111,10 +110,10 @@ test/test_transform_task_context.py
 test/test_transforms_base.py
 test/test_transforms_fetch.py
 test/test_transforms_from_deps.py
-test/test_transforms_job.py
-test/test_transforms_job_run_task.py
-test/test_transforms_job_toolchain.py
 test/test_transforms_notify.py
+test/test_transforms_run.py
+test/test_transforms_run_run_task.py
+test/test_transforms_run_toolchain.py
 test/test_transforms_task.py
 test/test_util_attributes.py
 test/test_util_dependencies.py

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/__init__.py

@@ -2,7 +2,7 @@
 # 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/.
 
-__version__ = "6.3.1"
+__version__ = "7.0.0"
 
 # Maximum number of dependencies a single task can have
 # https://docs.taskcluster.net/reference/platform/taskcluster-queue/references/api#createTask

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/config.py

@@ -102,28 +102,27 @@ class GraphConfig:
         Add the project's taskgraph directory to the python path, and register
         any extensions present.
         """
-        modify_path = os.path.dirname(self.root_dir)
         if GraphConfig._PATH_MODIFIED:
-            if GraphConfig._PATH_MODIFIED == modify_path:
+            if GraphConfig._PATH_MODIFIED == self.root_dir:
                 # Already modified path with the same root_dir.
                 # We currently need to do this to enable actions to call
                 # taskgraph_decision, e.g. relpro.
                 return
             raise Exception("Can't register multiple directories on python path.")
-        GraphConfig._PATH_MODIFIED = modify_path
-        sys.path.insert(0, modify_path)
+        GraphConfig._PATH_MODIFIED = self.root_dir
+        sys.path.insert(0, self.root_dir)
         register_path = self["taskgraph"].get("register")
         if register_path:
             find_object(register_path)(self)
 
     @property
     def vcs_root(self):
-        if path.split(self.root_dir)[-2:] != ["taskcluster", "ci"]:
+        if path.split(self.root_dir)[-1:] != ["taskcluster"]:
             raise Exception(
                 "Not guessing path to vcs root. "
                 "Graph config in non-standard location."
             )
-        return os.path.dirname(os.path.dirname(self.root_dir))
+        return os.path.dirname(self.root_dir)
 
     @property
     def taskcluster_yml(self):

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/create.py

@@ -104,7 +104,7 @@ def create_tasks(graph_config, taskgraph, label_to_taskid, params, decision_task
 
 def create_task(session, task_id, label, task_def):
     # create the task using 'http://taskcluster/queue', which is proxied to the queue service
-    # with credentials appropriate to this job.
+    # with credentials appropriate to this task.
 
     # Resolve timestamps
     now = current_json_time(datetime_format=True)

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/decision.py

@@ -46,21 +46,21 @@ try_task_config_schema_v2 = Schema(
 )
 
 
-def full_task_graph_to_runnable_jobs(full_task_json):
-    runnable_jobs = {}
+def full_task_graph_to_runnable_tasks(full_task_json):
+    runnable_tasks = {}
     for label, node in full_task_json.items():
         if not ("extra" in node["task"] and "treeherder" in node["task"]["extra"]):
             continue
 
         th = node["task"]["extra"]["treeherder"]
-        runnable_jobs[label] = {"symbol": th["symbol"]}
+        runnable_tasks[label] = {"symbol": th["symbol"]}
 
         for i in ("groupName", "groupSymbol", "collection"):
             if i in th:
-                runnable_jobs[label][i] = th[i]
+                runnable_tasks[label][i] = th[i]
         if th.get("machine", {}).get("platform"):
-            runnable_jobs[label]["platform"] = th["machine"]["platform"]
-    return runnable_jobs
+            runnable_tasks[label]["platform"] = th["machine"]["platform"]
+    return runnable_tasks
 
 
 def taskgraph_decision(options, parameters=None):
@@ -104,7 +104,7 @@ def taskgraph_decision(options, parameters=None):
 
     # write out the public/runnable-jobs.json file
     write_artifact(
-        "runnable-jobs.json", full_task_graph_to_runnable_jobs(full_task_json)
+        "runnable-jobs.json", full_task_graph_to_runnable_tasks(full_task_json)
     )
 
     # this is just a test to check whether the from_json() function is working

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/generator.py

@@ -91,7 +91,7 @@ class Kind:
 
     @classmethod
     def load(cls, root_dir, graph_config, kind_name):
-        path = os.path.join(root_dir, kind_name)
+        path = os.path.join(root_dir, "kinds", kind_name)
         kind_yml = os.path.join(path, "kind.yml")
         if not os.path.exists(kind_yml):
             raise KindNotFound(kind_yml)
@@ -125,13 +125,13 @@ class TaskGraphGenerator:
         write_artifacts=False,
     ):
         """
-        @param root_dir: root directory, with subdirectories for each kind
+        @param root_dir: root directory containing the Taskgraph config.yml file
         @param parameters: parameters for this task-graph generation, or callable
             taking a `GraphConfig` and returning parameters
         @type parameters: Union[Parameters, Callable[[GraphConfig], Parameters]]
         """
         if root_dir is None:
-            root_dir = "taskcluster/ci"
+            root_dir = "taskcluster"
         self.root_dir = root_dir
         self._parameters = parameters
         self._decision_task_id = decision_task_id
@@ -243,7 +243,7 @@ class TaskGraphGenerator:
                 yield kind
                 queue.extend(kind.config.get("kind-dependencies", []))
         else:
-            for kind_name in os.listdir(self.root_dir):
+            for kind_name in os.listdir(os.path.join(self.root_dir, "kinds")):
                 try:
                     yield Kind.load(self.root_dir, graph_config, kind_name)
                 except KindNotFound:

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/loader/default.py

@@ -11,7 +11,7 @@ logger = logging.getLogger(__name__)
 
 
 DEFAULT_TRANSFORMS = [
-    "taskgraph.transforms.job:transforms",
+    "taskgraph.transforms.run:transforms",
     "taskgraph.transforms.task:transforms",
 ]
 
@@ -20,7 +20,7 @@ def loader(kind, path, config, params, loaded_tasks):
     """
     This default loader builds on the `transform` loader by providing sensible
     default transforms that the majority of simple tasks will need.
-    Specifically, `job` and `task` transforms will be appended to the end of the
+    Specifically, `run` and `task` transforms will be appended to the end of the
     list of transforms in the kind being loaded.
     """
     transform_refs = config.setdefault("transforms", [])

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/main.py

@@ -464,6 +464,8 @@ def show_taskgraph(options):
             f"--label={options['graph_attr']}@{cur_rev}",
         ]
 
+        non_fatal_failures = []
+
         for spec in parameters:
             base_path = os.path.join(
                 diffdir, f"{options['graph_attr']}_{base_rev_file}"
@@ -476,7 +478,20 @@ def show_taskgraph(options):
                 base_path += f"_{params_name}"
                 cur_path += f"_{params_name}"
 
+            # If the base or cur files are missing it means that generation
+            # failed. If one of them failed but not the other, the failure is
+            # likely due to the patch making changes to taskgraph in modules
+            # that don't get reloaded (safe to ignore). If both generations
+            # failed, there's likely a real issue.
+            base_missing = not os.path.isfile(base_path)
+            cur_missing = not os.path.isfile(cur_path)
+            if base_missing != cur_missing:  # != is equivalent to XOR for booleans
+                non_fatal_failures.append(os.path.basename(base_path))
+                continue
+
             try:
+                # If the output file(s) are missing, this command will raise
+                # CalledProcessError with a returncode > 1.
                 proc = subprocess.run(
                     diffcmd + [base_path, cur_path],
                     capture_output=True,
@@ -501,6 +516,16 @@ def show_taskgraph(options):
                 params_spec=spec if len(parameters) > 1 else None,
             )
 
+        if non_fatal_failures:
+            failstr = "\n  ".join(sorted(non_fatal_failures))
+            print(
+                "WARNING: Diff skipped for the following generation{s} "
+                "due to failures:\n  {failstr}".format(
+                    s="s" if len(non_fatal_failures) > 1 else "", failstr=failstr
+                ),
+                file=sys.stderr,
+            )
+
         if options["format"] != "json":
             print(
                 "If you were expecting differences in task bodies "

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/run-task/run-task

@@ -787,9 +787,7 @@ def hg_checkout(
     branch: Optional[str],
     revision: Optional[str],
 ):
-    if IS_MACOSX:
-        hg_bin = "/tools/python27-mercurial/bin/hg"
-    elif IS_POSIX:
+    if IS_MACOSX or IS_POSIX:
         hg_bin = "hg"
     elif IS_WINDOWS:
         # This is where OCC installs it in the AMIs.

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/target_tasks.py

@@ -14,7 +14,7 @@ _target_task_methods = {}
 _GIT_REFS_HEADS_PREFIX = "refs/heads/"
 
 
-def _target_task(name):
+def register_target_task(name):
     def wrap(func):
         _target_task_methods[name] = func
         return func
@@ -81,7 +81,7 @@ def standard_filter(task, parameters):
     )
 
 
-@_target_task("default")
+@register_target_task("default")
 def target_tasks_default(full_task_graph, parameters, graph_config):
     """Target the tasks which have indicated they should be run on this project
     via the `run_on_projects` attributes."""
@@ -90,7 +90,7 @@ def target_tasks_default(full_task_graph, parameters, graph_config):
     ]
 
 
-@_target_task("codereview")
+@register_target_task("codereview")
 def target_tasks_codereview(full_task_graph, parameters, graph_config):
     """Target the tasks which have indicated they should be run on this project
     via the `run_on_projects` attributes."""
@@ -101,7 +101,7 @@ def target_tasks_codereview(full_task_graph, parameters, graph_config):
     ]
 
 
-@_target_task("nothing")
+@register_target_task("nothing")
 def target_tasks_nothing(full_task_graph, parameters, graph_config):
     """Select nothing, for DONTBUILD pushes"""
     return []

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/transforms/base.py

@@ -147,7 +147,7 @@ class ValidateSchema:
                     kind=config.kind, name=task["name"]
                 )
             elif "label" in task:
-                error = "In job {label!r}:".format(label=task["label"])
+                error = "In task {label!r}:".format(label=task["label"])
             elif "primary-dependency" in task:
                 error = "In {kind} kind task for {dependency!r}:".format(
                     kind=config.kind, dependency=task["primary-dependency"].label

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/transforms/code_review.py

@@ -12,12 +12,12 @@ transforms = TransformSequence()
 
 
 @transforms.add
-def add_dependencies(config, jobs):
-    for job in jobs:
-        job.setdefault("soft-dependencies", [])
-        job["soft-dependencies"] += [
+def add_dependencies(config, tasks):
+    for task in tasks:
+        task.setdefault("soft-dependencies", [])
+        task["soft-dependencies"] += [
             dep_task.label
             for dep_task in config.kind_dependencies_tasks.values()
             if dep_task.attributes.get("code-review") is True
         ]
-        yield job
+        yield task

{taskcluster-taskgraph-6.3.1 → taskcluster-taskgraph-7.0.0}/src/taskgraph/transforms/fetch.py

@@ -35,8 +35,8 @@ FETCH_SCHEMA = Schema(
         Optional("docker-image"): object,
         Optional(
             "fetch-alias",
-            description="An alias that can be used instead of the real fetch job name in "
-            "fetch stanzas for jobs.",
+            description="An alias that can be used instead of the real fetch task name in "
+            "fetch stanzas for tasks.",
         ): str,
         Optional(
             "artifact-prefix",
@@ -78,20 +78,20 @@ transforms.add_validate(FETCH_SCHEMA)
 
 
 @transforms.add
-def process_fetch_job(config, jobs):
-    # Converts fetch-url entries to the job schema.
-    for job in jobs:
-        typ = job["fetch"]["type"]
-        name = job["name"]
-        fetch = job.pop("fetch")
+def process_fetch_task(config, tasks):
+    # Converts fetch-url entries to the run schema.
+    for task in tasks:
+        typ = task["fetch"]["type"]
+        name = task["name"]
+        fetch = task.pop("fetch")
 
         if typ not in fetch_builders:
             raise Exception(f"Unknown fetch type {typ} in fetch {name}")
         validate_schema(fetch_builders[typ].schema, fetch, f"In task.fetch {name!r}:")
 
-        job.update(configure_fetch(config, typ, name, fetch))
+        task.update(configure_fetch(config, typ, name, fetch))
 
-        yield job
+        yield task
 
 
 def configure_fetch(config, typ, name, fetch):
@@ -103,7 +103,7 @@ def configure_fetch(config, typ, name, fetch):
 
 
 @transforms.add
-def make_task(config, jobs):
+def make_task(config, tasks):
     # Fetch tasks are idempotent and immutable. Have them live for
     # essentially forever.
     if config.params["level"] == "3":
@@ -111,33 +111,33 @@ def make_task(config, jobs):
     else:
         expires = "28 days"
 
-    for job in jobs:
-        name = job["name"]
-        artifact_prefix = job.get("artifact-prefix", "public")
-        env = job.get("env", {})
+    for task in tasks:
+        name = task["name"]
+        artifact_prefix = task.get("artifact-prefix", "public")
+        env = task.get("env", {})
         env.update({"UPLOAD_DIR": "/builds/worker/artifacts"})
-        attributes = job.get("attributes", {})
-        attributes["fetch-artifact"] = path.join(artifact_prefix, job["artifact_name"])
-        alias = job.get("fetch-alias")
+        attributes = task.get("attributes", {})
+        attributes["fetch-artifact"] = path.join(artifact_prefix, task["artifact_name"])
+        alias = task.get("fetch-alias")
         if alias:
             attributes["fetch-alias"] = alias
 
-        task = {
+        task_desc = {
             "attributes": attributes,
             "name": name,
-            "description": job["description"],
+            "description": task["description"],
             "expires-after": expires,
             "label": "fetch-%s" % name,
             "run-on-projects": [],
             "run": {
                 "using": "run-task",
                 "checkout": False,
-                "command": job["command"],
+                "command": task["command"],
             },
             "worker-type": "images",
             "worker": {
                 "chain-of-trust": True,
-                "docker-image": job.get("docker-image", {"in-tree": "fetch"}),
+                "docker-image": task.get("docker-image", {"in-tree": "fetch"}),
                 "env": env,
                 "max-run-time": 900,
                 "artifacts": [
@@ -151,29 +151,29 @@ def make_task(config, jobs):
         }
 
         if "treeherder" in config.graph_config:
-            task["treeherder"] = {
+            task_desc["treeherder"] = {
                 "symbol": join_symbol("Fetch", name),
                 "kind": "build",
                 "platform": "fetch/opt",
                 "tier": 1,
             }
 
-        if job.get("secret", None):
-            task["scopes"] = ["secrets:get:" + job.get("secret")]
-            task["worker"]["taskcluster-proxy"] = True
+        if task.get("secret", None):
+            task_desc["scopes"] = ["secrets:get:" + task.get("secret")]
+            task_desc["worker"]["taskcluster-proxy"] = True
 
         if not taskgraph.fast:
-            cache_name = task["label"].replace(f"{config.kind}-", "", 1)
+            cache_name = task_desc["label"].replace(f"{config.kind}-", "", 1)
 
             # This adds the level to the index path automatically.
             add_optimization(
                 config,
-                task,
+                task_desc,
                 cache_type=CACHE_TYPE,
                 cache_name=cache_name,
-                digest_data=job["digest_data"],
+                digest_data=task["digest_data"],
             )
-        yield task
+        yield task_desc
 
 
 @fetch_builder(