Merge pull request #511 from escapewindow/tc-40plus

Fix claimWork in scriptworker + tc>39

Author: escapewindow

requirements.txt

@@ -8,4 +8,4 @@ immutabledict>=1.3.0
 jsonschema
 json-e>=2.5.0
 PyYAML
-taskcluster
+taskcluster>39

src/scriptworker/config.py

@@ -12,7 +12,7 @@
 import os
 import re
 import sys
-from collections import Mapping
+from collections.abc import Mapping
 from copy import deepcopy
 
 from immutabledict import immutabledict

src/scriptworker/task.py

@@ -746,6 +746,6 @@ async def claim_work(context):
         "tasks": 1,
     }
     try:
-        return await context.queue.claimWork(context.config["provisioner_id"], context.config["worker_type"], payload)
+        return await context.queue.claimWork(f"{context.config['provisioner_id']}/{context.config['worker_type']}", payload)
     except (taskcluster.exceptions.TaskclusterFailure, aiohttp.ClientError, asyncio.TimeoutError) as exc:
         log.warning("{} {}".format(exc.__class__, exc))