taskcluster-taskgraph 24.2.0__py3-none-any.whl → 24.2.2__py3-none-any.whl

{taskcluster_taskgraph-24.2.0.dist-info → taskcluster_taskgraph-24.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskcluster-taskgraph
-Version: 24.2.0
+Version: 24.2.2
 Summary: Build taskcluster taskgraphs
 Project-URL: Repository, https://github.com/taskcluster/taskgraph
 Project-URL: Issues, https://github.com/taskcluster/taskgraph/issues

{taskcluster_taskgraph-24.2.0.dist-info → taskcluster_taskgraph-24.2.2.dist-info}/RECORD

@@ -6,7 +6,7 @@ taskgraph/docker.py,sha256=5k9ZjooqvtBDtb3AAZijUdUNzgRcm6CXM5CrmLO0KFA,24429
 taskgraph/filter_tasks.py,sha256=R7tYXiaVPGIkQ6O1c9-QJrKZ59m9pFXCloUlPraVnZU,866
 taskgraph/generator.py,sha256=zanO2GOb0HWEGOQkEZGmXP0JySql71xoeENjk-cKOc8,23170
 taskgraph/graph.py,sha256=GGNY9n44xVgz_LbnprbQDY1IFcNV9oxhrBavu3SW-V8,6202
-taskgraph/main.py,sha256=C7x1xHkDuABQE0RP6VGXDsF2YlvQhGDhtvO32TeSo5Y,38970
+taskgraph/main.py,sha256=miuQkXuxD9eAUa0MqORARdyCRVtsqobLA-vW6n1sf_Y,39424
 taskgraph/morph.py,sha256=pF9_bqM2aNpNfSH7xEFWQz83ohxxVdUUDqdv2yq7waA,9232
 taskgraph/parameters.py,sha256=dlEC048z06WKdIL8QhH1nu2hy9jF4AQ4KcVfJauIXyk,13867
 taskgraph/target_tasks.py,sha256=9_v66bzmQFELPsfIDGITXrqzsmEiLq1EeuJFhycKL0M,3356
@@ -50,7 +50,7 @@ taskgraph/transforms/run/toolchain.py,sha256=LhaZ_8iI63QNhkolAY3vU5675vT9kbxbCZk
 taskgraph/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 taskgraph/util/archive.py,sha256=4XcH0FvUZIDs6MYzopFVlItM5J5JllFEXg9buZB3QVc,5104
 taskgraph/util/attributes.py,sha256=pPOFmwkDQQ-IqfDpVghZ10YI_qXRY4Bi5JP3xr6XVvc,2964
-taskgraph/util/cached_tasks.py,sha256=GKL3X_Pp0bQE96IdIP6PnDM7XTgecWyhbiGuC2H7KVI,4180
+taskgraph/util/cached_tasks.py,sha256=wSXEt29inOaDwGu5XpRSXIj_9l8lga2nSgHsRbu8rnM,4171
 taskgraph/util/caches.py,sha256=FByNYkpSYI8xdKvpplUXiX0_JCGX4j8aWnOa6Vj7g8s,1711
 taskgraph/util/copy.py,sha256=-AgF3oPF3lfiUHvAOiGkhUzS68i9kcWRsyDSiBkAVCw,1577
 taskgraph/util/dependencies.py,sha256=EJjqEadk709fYVgj6joYCZII_1rZJ8Va34YZBCAGMc0,2645
@@ -75,8 +75,8 @@ taskgraph/util/vcs.py,sha256=Z2sCJT0-kwP_AbSUMIzya9lk8SyjWPzMYtQPYJ2WtnA,22496
 taskgraph/util/verify.py,sha256=hY6xl4rEgXeVuPswG8HCGBHJNKHF2QXx2cTxrrRtDeE,14829
 taskgraph/util/workertypes.py,sha256=SpqQmf99kB9QxtgOdXeMUvzuVv1o0ZVB4lYahZH3jDY,2534
 taskgraph/util/yaml.py,sha256=29h6RE7JA4z0U2V3WCu-S39lPMBS9CEZEglv1delDvw,1075
-taskcluster_taskgraph-24.2.0.dist-info/METADATA,sha256=SryNjz6kHa2pG1C4xRwkKRp7Nfs66SeQH7Lj8f8fpEM,5065
-taskcluster_taskgraph-24.2.0.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
-taskcluster_taskgraph-24.2.0.dist-info/entry_points.txt,sha256=2hxDzE3qq_sHh-J3ROqwpxgQgxO-196phWAQREl2-XA,50
-taskcluster_taskgraph-24.2.0.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
-taskcluster_taskgraph-24.2.0.dist-info/RECORD,,
+taskcluster_taskgraph-24.2.2.dist-info/METADATA,sha256=dgtz4W6pVH4-KRYuFfTfcs7rJyUUq6AnEVJ9uT56stk,5065
+taskcluster_taskgraph-24.2.2.dist-info/WHEEL,sha256=lCkmxWfQsSc9CfIClYeavTdQeEX2toPqufh9gI35EQA,87
+taskcluster_taskgraph-24.2.2.dist-info/entry_points.txt,sha256=2hxDzE3qq_sHh-J3ROqwpxgQgxO-196phWAQREl2-XA,50
+taskcluster_taskgraph-24.2.2.dist-info/licenses/LICENSE,sha256=HyVuytGSiAUQ6ErWBHTqt1iSGHhLmlC8fO7jTCuR8dU,16725
+taskcluster_taskgraph-24.2.2.dist-info/RECORD,,

taskgraph/main.py

@@ -179,6 +179,16 @@ def format_taskgraph(options, parameters, overrides, logfile=None):
     return format_method(tg)
 
 
+def format_taskgraph_multiple(*args, **kwargs):
+    """Thin wrapper around format_taskgraph to avoid the taskgraph generator
+    that it runs using multiple processes. (This function is intended to be
+    called by something that is already using a ProcessPoolExecutor, so
+    there's no advantage to spawning additional processes in the subprocesses.)"""
+
+    os.environ["TASKGRAPH_SERIAL"] = "1"
+    return format_taskgraph(*args, **kwargs)
+
+
 def dump_output(out, path=None, params_spec=None):
     from taskgraph.parameters import Parameters  # noqa: PLC0415
 
@@ -226,7 +236,7 @@ def generate_taskgraph(options, parameters, overrides, logdir):
     with ProcessPoolExecutor(max_workers=options["max_workers"]) as executor:
         for spec in parameters:
             f = executor.submit(
-                format_taskgraph, options, spec, overrides, logfile(spec)
+                format_taskgraph_multiple, options, spec, overrides, logfile(spec)
             )
             futures[f] = spec
 

taskgraph/util/cached_tasks.py

@@ -63,9 +63,9 @@ def add_optimization(
     # Pull requests use a different target cache index route. This way we can
     # be confident they won't be used by anything other than the pull request
     # that created the cache in the first place.
-    if config.params["tasks_for"].startswith(
-        "github-pull-request"
-    ) and config.graph_config["taskgraph"].get("cache-pull-requests", True):
+    if config.params["tasks_for"] == "github-pull-request" and config.graph_config[
+        "taskgraph"
+    ].get("cache-pull-requests", True):
         subs["head_ref"] = config.params["head_ref"]
         if subs["head_ref"].startswith("refs/heads/"):
             subs["head_ref"] = subs["head_ref"][11:]