taskcluster-taskgraph 10.0.0__tar.gz → 10.0.2__tar.gz

{taskcluster-taskgraph-10.0.0/src/taskcluster_taskgraph.egg-info → taskcluster-taskgraph-10.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 10.0.0
+Version: 10.0.2
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2/src/taskcluster_taskgraph.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskcluster-taskgraph
-Version: 10.0.0
+Version: 10.0.2
 Summary: Build taskcluster taskgraphs
 Home-page: https://github.com/taskcluster/taskgraph
 Classifier: Development Status :: 5 - Production/Stable

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/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__ = "10.0.0"
+__version__ = "10.0.2"
 
 # Maximum number of dependencies a single task can have
 # https://docs.taskcluster.net/reference/platform/taskcluster-queue/references/api#createTask

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/src/taskgraph/optimize/strategies.py

@@ -50,7 +50,7 @@ class IndexSearch(OptimizationStrategy):
                 # (e.g. test-action-callback)
                 if not status or status.get("state") in ("exception", "failed"):
                     logger.debug(
-                        f'not replacing {task["label"]} with {task_id} because it is in failed or exception state'
+                        f"not replacing {task.label} with {task_id} because it is in failed or exception state"
                     )
                     continue
 
@@ -58,7 +58,7 @@ class IndexSearch(OptimizationStrategy):
                     status["expires"], self.fmt
                 ) < datetime.strptime(deadline, self.fmt):
                     logger.debug(
-                        f'not replacing {task["label"]} with {task_id} because it expires before {deadline}'
+                        f"not replacing {task.label} with {task_id} because it expires before {deadline}"
                     )
                     continue
 

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/src/taskgraph/transforms/run/__init__.py

@@ -251,7 +251,9 @@ def use_fetches(config, tasks):
         for kind in sorted(fetches):
             artifacts = fetches[kind]
             if kind in ("fetch", "toolchain"):
-                for artifact in sorted(artifacts):
+                for artifact in sorted(
+                    artifacts, key=lambda a: a if isinstance(a, str) else a["artifact"]
+                ):
                     # Convert name only fetch entries to full fledged ones for
                     # easier processing.
                     if isinstance(artifact, str):

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/src/taskgraph/util/vcs.py

@@ -445,6 +445,9 @@ class GitRepository(Repository):
             cmd = ["log", "--format=format:", revision_argument]
 
         cmd.append("--name-only")
+        cmd.append(
+            "--no-renames"
+        )  # Consider renames as deletion of old, addition of new.
         cmd.append("--diff-filter=" + diff_filter.upper())
 
         files = self.run(*cmd).splitlines()

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/test/test_optimize_strategies.py

@@ -33,6 +33,7 @@ def params():
             False,
             (
                 "not replacing {label} with {taskid} because it expires before {deadline}",
+                "not replacing {label} with {taskid} because it expires before {deadline}",
             ),
         ),
         ("completed", "2021-06-08T14:53:16.937Z", "abc", ()),
@@ -42,6 +43,7 @@ def params():
             False,
             (
                 "not replacing {label} with {taskid} because it is in failed or exception state",
+                "not replacing {label} with {taskid} because it is in failed or exception state",
             ),
         ),
         (
@@ -50,6 +52,7 @@ def params():
             False,
             (
                 "not replacing {label} with {taskid} because it is in failed or exception state",
+                "not replacing {label} with {taskid} because it is in failed or exception state",
             ),
         ),
     ),
@@ -90,7 +93,7 @@ def test_index_search(caplog, responses, params, state, expires, expected, logs)
     deadline = "2021-06-07T19:03:20.482Z"
     assert (
         opt.should_replace_task(
-            {"label": "task-label"},
+            make_task("task-label"),
             params,
             deadline,
             ([index_path], label_to_taskid, taskid_to_status),
@@ -98,7 +101,10 @@ def test_index_search(caplog, responses, params, state, expires, expected, logs)
         == expected
     )
     # test the non-batched variant as well
-    assert opt.should_replace_task({}, params, deadline, [index_path]) == expected
+    assert (
+        opt.should_replace_task(make_task("task-label"), params, deadline, [index_path])
+        == expected
+    )
 
     if logs:
         log_records = [

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/test/test_transforms_run.py

@@ -96,6 +96,23 @@ def assert_use_fetches_toolchain_extract_false(task):
     assert fetches[0]["extract"] is False
 
 
+def assert_use_fetches_toolchain_mixed(task):
+    fetches = json.loads(task["worker"]["env"]["MOZ_FETCHES"]["task-reference"])
+    assert len(fetches) == 2
+    assert fetches == [
+        {
+            "artifact": "bar.zip",
+            "extract": True,
+            "task": "<toolchain-bar>",
+        },
+        {
+            "artifact": "target.whl",
+            "extract": False,
+            "task": "<toolchain-foo>",
+        },
+    ]
+
+
 @pytest.mark.parametrize(
     "task,kind_dependencies_tasks",
     (
@@ -128,6 +145,28 @@ def assert_use_fetches_toolchain_extract_false(task):
             ],
             id="toolchain_extract_false",
         ),
+        pytest.param(
+            {"fetches": {"toolchain": [{"artifact": "foo", "extract": False}, "bar"]}},
+            [
+                Task(
+                    kind="toolchain",
+                    label="toolchain-foo",
+                    attributes={
+                        "toolchain-artifact": "target.whl",
+                    },
+                    task={},
+                ),
+                Task(
+                    kind="toolchain",
+                    label="toolchain-bar",
+                    attributes={
+                        "toolchain-artifact": "bar.zip",
+                    },
+                    task={},
+                ),
+            ],
+            id="toolchain_mixed",
+        ),
     ),
 )
 def test_use_fetches(

{taskcluster-taskgraph-10.0.0 → taskcluster-taskgraph-10.0.2}/test/test_util_vcs.py

@@ -277,42 +277,59 @@ def test_get_changed_files_one_added_file(repo):
 def test_get_changed_files_two_revisions(repo):
     with open(os.path.join(repo.path, "second_file"), "w") as f:
         f.write("some data for the second file")
-    repo.run("add", "second_file")
-    repo.run("commit", "-m", "Add second_file")
+    with open(os.path.join(repo.path, "fourth_file"), "w") as f:
+        f.write("some data for the fourth file")
+    repo.run("add", "second_file", "fourth_file")
+    repo.run("commit", "-m", "Add second_file and fourth_file")
 
     os.remove(os.path.join(repo.path, "first_file"))
     with open(os.path.join(repo.path, "second_file"), "w") as f:
         f.write("new data for second file")
     with open(os.path.join(repo.path, "third_file"), "w") as f:
         f.write("third type of data")
+    os.rename(
+        os.path.join(repo.path, "fourth_file"),
+        os.path.join(repo.path, "fourth_file_new"),
+    )
 
-    repo.run("rm", "first_file")
+    repo.run("rm", "first_file", "fourth_file")
     repo.run("add", ".")
-    repo.run("commit", "-m", "Remove first_file; modify second_file; add third_file")
+    repo.run(
+        "commit",
+        "-m",
+        "Remove first_file; modify second_file; add third_file, rename fourth_file",
+    )
 
     last_revision = "HEAD" if repo.tool == "git" else "."
-    assert_files(repo.get_changed_files("A", "all", last_revision), ["third_file"])
+    assert_files(
+        repo.get_changed_files("A", "all", last_revision),
+        ["third_file", "fourth_file_new"],
+    )
     assert_files(repo.get_changed_files("M", "all", last_revision), ["second_file"])
-    assert_files(repo.get_changed_files("D", "all", last_revision), ["first_file"])
+    assert_files(
+        repo.get_changed_files("D", "all", last_revision), ["first_file", "fourth_file"]
+    )
     assert_files(
         repo.get_changed_files("AMD", "all", last_revision),
-        ["first_file", "second_file", "third_file"],
+        ["first_file", "second_file", "third_file", "fourth_file_new", "fourth_file"],
     )
 
     one_before_last_revision = "HEAD~1" if repo.tool == "git" else ".^"
     assert_files(
-        repo.get_changed_files("A", "all", one_before_last_revision), ["second_file"]
+        repo.get_changed_files("A", "all", one_before_last_revision),
+        ["second_file", "fourth_file"],
     )
     assert_files(repo.get_changed_files("M", "all", one_before_last_revision), [])
     assert_files(repo.get_changed_files("D", "all", one_before_last_revision), [])
     assert_files(
-        repo.get_changed_files("AMD", "all", one_before_last_revision), ["second_file"]
+        repo.get_changed_files("AMD", "all", one_before_last_revision),
+        ["second_file", "fourth_file"],
     )
 
     two_before_last_revision = "HEAD~2" if repo.tool == "git" else ".^^"
     assert_files(
         repo.get_changed_files("A", "all", last_revision, two_before_last_revision),
-        ["third_file", "second_file"],
+        ["third_file", "second_file", "fourth_file", "fourth_file_new"],
     )
     assert_files(
         repo.get_changed_files("M", "all", last_revision, two_before_last_revision),
@@ -320,11 +337,11 @@ def test_get_changed_files_two_revisions(repo):
     )
     assert_files(
         repo.get_changed_files("D", "all", last_revision, two_before_last_revision),
-        ["first_file"],
+        ["first_file", "fourth_file"],
     )
     assert_files(
         repo.get_changed_files("AMD", "all", last_revision, two_before_last_revision),
-        ["first_file", "second_file", "third_file"],
+        ["first_file", "second_file", "third_file", "fourth_file", "fourth_file_new"],
     )