python3.8 compat

Author: olupton

.github/triage/jax_toolbox_triage/logic.py

@@ -1,4 +1,3 @@
-import collections
 from dataclasses import dataclass
 import datetime
 import functools
@@ -204,7 +203,7 @@ def _not_first(d):
 
 def commit_search(
     *,
-    commits: collections.OrderedDict[
+    commits: typing.OrderedDict[
         str, typing.Sequence[typing.Tuple[str, datetime.datetime]]
     ],
     build_and_test: BuildAndTest,
@@ -342,13 +341,13 @@ def commit_search(
         for secondary, secondary_commit in _not_first(blame_commits):
             log_str += f" {secondary} {secondary_commit}"
         logger.info(log_str)
-        return {
+        ret = {
             f"{primary}_bad": bad_commit,
             f"{primary}_good": good_commit,
-        } | {
-            f"{secondary}_ref": secondary_commit
-            for secondary, secondary_commit in _not_first(blame_commits)
         }
+        for secondary, secondary_commit in _not_first(blame_commits):
+            ret[f"{secondary}_ref"] = secondary_commit
+        return ret
     else:
         # Test failed with both {pX, sZ, tZ, ...} and {pZ, sZ, tZ, ...}, so
         # we can fix the primary package to pX and recurse with the old

.github/triage/tests/test_triage_logic.py

@@ -135,7 +135,7 @@ def dummy_test(*, commits):
     )
     # Do not check the reference commits, it's a bit underspecified quite what they
     # mean, other than that the dummy_test assertions below should pass
-    ref_commits = {
+    commits = {
         package: algorithm_result.pop(f"{package}_ref")
         for package in package_names
         if package != culprit
@@ -144,12 +144,10 @@ def dummy_test(*, commits):
         f"{culprit}_bad": bad_commit,
         f"{culprit}_good": good_commit,
     } == algorithm_result
-    assert dummy_test(
-        commits={culprit: algorithm_result[f"{culprit}_good"]} | ref_commits
-    ).result
-    assert not dummy_test(
-        commits={culprit: algorithm_result[f"{culprit}_bad"]} | ref_commits
-    ).result
+    commits[culprit] = algorithm_result[f"{culprit}_good"]
+    assert dummy_test(commits=commits).result
+    commits[culprit] = algorithm_result[f"{culprit}_bad"]
+    assert not dummy_test(commits=commits).result
 
 
 def other(project):
@@ -267,13 +265,15 @@ def dummy_test(*, commits):
     assert algorithm_result[f"{bad_project}_bad"] == bad_commit
     assert algorithm_result[f"{bad_project}_good"] == good_commit
     # Do check that the reference commit gives the expected results
-    ref_commits = {
+    commits = {
         proj: algorithm_result[f"{proj}_ref"]
         for proj in all_projects
         if proj != bad_project
     }
-    assert not dummy_test(commits={bad_project: bad_commit} | ref_commits).result
-    assert dummy_test(commits={bad_project: good_commit} | ref_commits).result
+    commits[bad_project] = bad_commit
+    assert not dummy_test(commits=commits).result
+    commits[bad_project] = good_commit
+    assert dummy_test(commits=commits).result
 
 
 @pytest.mark.parametrize(