scriptworker 62.2.3__tar.gz → 62.4.0__tar.gz

{scriptworker-62.2.3 → scriptworker-62.4.0}/HISTORY.rst

@@ -4,6 +4,24 @@ Change Log
 All notable changes to this project will be documented in this file.
 This project adheres to `Semantic Versioning <http://semver.org/>`__.
 
+62.4.0 - 2026-02-10
+-------------------
+
+Added
+~~~~~
+
+- add repository type to jsone context for cron and hg-push tasks (#763)
+- add support for python 3.14 (#744)
+- `translations-1/images` is a valid pool for images tasks (#773)
+
+62.3.0 - 2026-01-06
+-------------------
+
+Added
+~~~~~
+
+- `translations-1/decision` is a valid pool for decision tasks
+
 62.2.3 - 2025-12-05
 -------------------
 

{scriptworker-62.2.3 → scriptworker-62.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scriptworker
-Version: 62.2.3
+Version: 62.4.0
 Summary: Taskcluster scriptworker
 Author-email: Mozilla Release Engineering <releng@mozilla.com>
 License-File: LICENSE
@@ -9,9 +9,9 @@ Classifier: Natural Language :: English
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.11
 Requires-Dist: aiohttp>=3
-Requires-Dist: aiomemoizettl
 Requires-Dist: arrow>=1.0
 Requires-Dist: cryptography>=2.6.1
 Requires-Dist: dictdiffer

{scriptworker-62.2.3 → scriptworker-62.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "scriptworker"
-version = "62.2.3"
+version = "62.4.0"
 description = "Taskcluster scriptworker"
 authors = [
     { name = "Mozilla Release Engineering", email = "releng@mozilla.com" },
@@ -13,10 +13,10 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
 ]
 dependencies = [
     "aiohttp>=3",
-    "aiomemoizettl",
     "arrow>=1.0",
     "cryptography>=2.6.1",
     "dictdiffer",
@@ -35,8 +35,7 @@ docs = [
     "commonmark",
     "myst-parser",
     "recommonmark",
-    # https://github.com/readthedocs/readthedocs.org/issues/10279
-    "Sphinx<7",
+    "Sphinx",
     "sphinx_rtd_theme",
 ]
 dev = [
@@ -50,9 +49,8 @@ dev = [
     "flake8_docstrings",
     "isort>=5",
     "mock",
-    "pydocstyle==3.0.0",
     "pytest",
-    "pytest-asyncio<1.0",
+    "pytest-asyncio",
     "pytest-mock",
     "pytest-random-order",
     "mypy",

scriptworker-62.4.0/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>mozilla-releng/reps:renovate-preset.json5"
+  ]
+}

{scriptworker-62.2.3 → scriptworker-62.4.0}/scripts/gen_ed25519_key.py

@@ -5,6 +5,7 @@ This script doesn't currently reuse the functions in `scriptworker.ed25519`, for
 easier standalone use. It could easily be a `console_script` though.
 
 """
+
 from __future__ import print_function
 
 import base64

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/client.py

@@ -9,6 +9,7 @@ Attributes:
     log (logging.Logger): the log object for the module
 
 """
+
 import asyncio
 import logging
 import os

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/config.py

@@ -7,6 +7,7 @@ Attributes:
         credentials, if they aren't in the config file or environment.
 
 """
+
 import argparse
 import logging
 import os

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/constants.py

@@ -216,7 +216,10 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict(
                             "comm-2/decision-gcp",
                             "comm-3/decision-gcp",
                         ),
-                        "translations": ("translations-1/decision-gcp",),
+                        "translations": (
+                            "translations-1/decision",
+                            "translations-1/decision-gcp",
+                        ),
                         "xpi": (
                             "xpi-1/decision",
                             "xpi-3/decision",
@@ -289,7 +292,10 @@ DEFAULT_CONFIG: immutabledict[str, Any] = immutabledict(
                             "comm-2/images-gcp",
                             "comm-3/images-gcp",
                         ),
-                        "translations": ("translations-1/images-gcp",),
+                        "translations": (
+                            "translations-1/images",
+                            "translations-1/images-gcp",
+                        ),
                         "xpi": (
                             "xpi-1/images",
                             "xpi-3/images",

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/context.py

@@ -10,6 +10,7 @@ Attributes:
     DEFAULT_MAX_CONCURRENT_DOWNLOADS (int): default max concurrent downloads
 
 """
+
 import asyncio
 import json
 import logging

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/cot/generate.py

@@ -5,6 +5,7 @@ Attributes:
     log (logging.Logger): the log object for this module.
 
 """
+
 import logging
 import os
 

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/cot/verify.py

@@ -719,12 +719,8 @@ async def download_cot_artifact(chain, task_id, path):
     link = chain.get_link(task_id)
     log.debug("Verifying {} is in {} cot artifacts...".format(path, task_id))
     if not link.cot:
-        log.warning(
-            'Chain of Trust for "{}" in {} does not exist. See above log for more details. \
-Skipping download of this artifact'.format(
-                path, task_id
-            )
-        )
+        log.warning('Chain of Trust for "{}" in {} does not exist. See above log for more details. \
+Skipping download of this artifact'.format(path, task_id))
         return
 
     if path not in link.cot["artifacts"]:
@@ -1175,7 +1171,7 @@ async def _get_additional_git_cron_jsone_context(decision_link):
             "sender": {"login": user},
         },
         # Taskgraph cron contexts mirror hg-push contexts
-        "repository": {"url": repo, "project": repo_name, "level": await get_scm_level(decision_link.context, repo_name)},
+        "repository": {"url": repo, "project": repo_name, "level": await get_scm_level(decision_link.context, repo_name), "type": "git"},
         "push": {"revision": revision, "branch": branch},
     }
 
@@ -1363,8 +1359,10 @@ async def populate_jsone_context(chain, parent_link, decision_link, tasks_for):
             jsone_context.update(await _get_additional_hg_action_jsone_context(parent_link, decision_link))
         elif tasks_for == "hg-push":
             jsone_context.update(await _get_additional_hg_push_jsone_context(parent_link, decision_link))
+            jsone_context["repository"]["type"] = "hg"
         elif tasks_for == "cron":
             jsone_context.update(await _get_additional_hg_cron_jsone_context(parent_link, decision_link))
+            jsone_context["repository"]["type"] = "hg"
         else:
             raise CoTError('Unknown tasks_for "{}" for hg cot_product "{}"!'.format(tasks_for, chain.context.config["cot_product"]))
     else:
@@ -2101,12 +2099,11 @@ def verify_cot_cmdln(args=None, event_loop=None):
             ``sys.argv[1:]`` .  Defaults to None.
 
         event_loop (asyncio.events.AbstractEventLoop): the event loop to use.
-            If ``None``, use ``asyncio.get_event_loop()``. Defaults to ``None``.
+            If ``None``, use ``asyncio.new_event_loop()``. Defaults to ``None``.
 
     """
     args = args or sys.argv[1:]
-    parser = argparse.ArgumentParser(
-        description="""Verify a given task's chain of trust.
+    parser = argparse.ArgumentParser(description="""Verify a given task's chain of trust.
 
 Given a task's `task_id`, get its task definition, then trace its chain of
 trust back to the tree.  This doesn't verify chain of trust artifact signatures,
@@ -2118,8 +2115,7 @@ To use, first either set your taskcluster creds in your env http://bit.ly/2eDMa6
 or in the CREDS_FILES http://bit.ly/2fVMu0A
 
 If you are verifying against a private github repo, please also set in environment
-SCRIPTWORKER_GITHUB_OAUTH_TOKEN to an OAUTH token with read permissions to the repo"""
-    )
+SCRIPTWORKER_GITHUB_OAUTH_TOKEN to an OAUTH token with read permissions to the repo""")
     parser.add_argument("task_id", help="the task id to test")
     parser.add_argument("--task-type", help="the task type to test", choices=sorted(get_valid_task_types().keys()), required=True)
     parser.add_argument("--cleanup", help="clean up the temp dir afterwards", dest="cleanup", action="store_true", default=False)
@@ -2133,7 +2129,7 @@ SCRIPTWORKER_GITHUB_OAUTH_TOKEN to an OAUTH token with read permissions to the r
     level = logging.DEBUG if opts.verbose else logging.INFO
     log.setLevel(level)
     logging.basicConfig(level=level)
-    event_loop = event_loop or asyncio.get_event_loop()
+    event_loop = event_loop or asyncio.new_event_loop()
     if not opts.cleanup:
         log.info("Artifacts will be in {}".format(tmp))
     try:
@@ -2182,19 +2178,17 @@ def create_test_workdir(args=None, event_loop=None):
             ``sys.argv[1:]`` .  Defaults to None.
 
         event_loop (asyncio.events.AbstractEventLoop): the event loop to use.
-            If ``None``, use ``asyncio.get_event_loop()``. Defaults to ``None``.
+            If ``None``, use ``asyncio.new_event_loop()``. Defaults to ``None``.
 
     """
     args = args or sys.argv[1:]
-    parser = argparse.ArgumentParser(
-        description="""Populate a test `work_dir`.
+    parser = argparse.ArgumentParser(description="""Populate a test `work_dir`.
 
 Given a scriptworker task's `task_id`, get its task definition, write it to
 `./work/task.json`, then download its `upstreamArtifacts` and put them in
 `./work/cot/TASK_ID/PATH`.
 
-This is helpful in manually testing a *script run."""
-    )
+This is helpful in manually testing a *script run.""")
     parser.add_argument("--path", help="relative path to the work_dir", default="work")
     parser.add_argument("--overwrite", help="overwrite an existing work_dir", action="store_true")
     parser.add_argument("task_id", help="the task id to test")
@@ -2209,6 +2203,6 @@ This is helpful in manually testing a *script run."""
             sys.exit(1)
         rm(opts.path)
     makedirs(opts.path)
-    event_loop = event_loop or asyncio.get_event_loop()
+    event_loop = event_loop or asyncio.new_event_loop()
     event_loop.run_until_complete(_async_create_test_workdir(opts.task_id, opts.path))
     log.info("Done.")

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/ed25519.py

@@ -5,6 +5,7 @@ Attributes:
     log (logging.Logger): the log object for the module
 
 """
+
 import argparse
 import base64
 import functools
@@ -140,13 +141,11 @@ def verify_ed25519_signature_cmdln(args=None, exception=SystemExit):
 
     """
     args = args or sys.argv[1:]
-    parser = argparse.ArgumentParser(
-        description="""Verify an ed25519 signature from the command line.
+    parser = argparse.ArgumentParser(description="""Verify an ed25519 signature from the command line.
 
 Given a file and its detached signature, verify that it has been signed with
 a valid key. This key can be specified on the command line; otherwise we'll
-default to ``config['ed25519_public_keys']``."""
-    )
+default to ``config['ed25519_public_keys']``.""")
     parser.add_argument("--pubkey", help="path to a base64-encoded ed25519 pubkey, optional")
     parser.add_argument("file_path")
     parser.add_argument("sig_path")

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/github.py

@@ -1,9 +1,9 @@
 """GitHub helper functions."""
 
+import asyncio
 import logging
 import re
 
-from aiomemoizettl import memoize_ttl
 from github3 import GitHub
 from github3.exceptions import GitHubException
 
@@ -136,24 +136,38 @@ class GitHubRepository:
         return html_text != ""
 
 
-# TODO Use memoize_ttl() as decorator once https://github.com/michalc/aiomemoizettl/issues/2 is done
-async def _fetch_github_branch_commits_data_helper(context, repo_html_url, revision):
-    url = "/".join((repo_html_url.rstrip("/"), "branch_commits", revision))
-    log.info('Cache does not exist for URL "{}" (in this context), fetching it...'.format(url))
-    html_text = await retry_request(context, url)
-    return html_text.strip()
+_BRANCH_COMMITS_CACHE_TTL_IN_SECONDS = 10 * 60  # 10 minutes
+_BRANCH_COMMITS_CACHE = {}
 
 
-# XXX memoize_ttl() uses all function parameters to create a key that stores its cache.
-# This means new contexts cannot use the memoized value, even though they're calling the same
-# repo and revision. jlorenzo tried to take the context out of the memoize_ttl() call, but
-# whenever the cache is invalidated, request() doesn't work anymore because the session carried
-# by the context has been long closed.
-# Therefore, the defined TTL has 2 purposes:
-#  a. it memoizes calls for the time of a single cot_verify() run
-#  b. it clears the cache automatically, so we don't have to manually invalidate it.
-_BRANCH_COMMITS_CACHE_TTL_IN_SECONDS = 10 * 60  # 10 minutes
-_fetch_github_branch_commits_data = memoize_ttl(_fetch_github_branch_commits_data_helper, get_ttl=lambda _: _BRANCH_COMMITS_CACHE_TTL_IN_SECONDS)
+async def _fetch_github_branch_commits_data(context, repo_html_url, revision):
+    # Include context identity because different contexts carry
+    # different HTTP sessions that may be closed independently.
+    cache_key = (id(context), repo_html_url, revision)
+
+    if cache_key in _BRANCH_COMMITS_CACHE:
+        return await _BRANCH_COMMITS_CACHE[cache_key]
+
+    future = asyncio.get_running_loop().create_future()
+    _BRANCH_COMMITS_CACHE[cache_key] = future
+
+    try:
+        url = "/".join((repo_html_url.rstrip("/"), "branch_commits", revision))
+        html_text = await retry_request(context, url)
+        result = html_text.strip()
+        future.set_result(result)
+        asyncio.get_running_loop().call_later(
+            _BRANCH_COMMITS_CACHE_TTL_IN_SECONDS,
+            _BRANCH_COMMITS_CACHE.pop,
+            cache_key,
+            None,
+        )
+    except BaseException as e:
+        _BRANCH_COMMITS_CACHE.pop(cache_key, None)
+        future.set_exception(e)
+        raise
+
+    return result
 
 
 def is_github_url(url):

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/log.py

@@ -5,6 +5,7 @@ Attributes:
     log (logging.Logger): the log object for this module.
 
 """
+
 import asyncio
 import logging
 import logging.handlers

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/utils.py

@@ -5,6 +5,7 @@ Attributes:
     log (logging.Logger): the log object for the module
 
 """
+
 import asyncio
 import functools
 import hashlib

{scriptworker-62.2.3 → scriptworker-62.4.0}/src/scriptworker/worker.py

@@ -5,6 +5,7 @@ Attributes:
     log (logging.Logger): the log object for the module.
 
 """
+
 import asyncio
 import logging
 import signal

{scriptworker-62.2.3 → scriptworker-62.4.0}/tox.ini

@@ -48,6 +48,10 @@ commands=
 commands=
     py.test -k test_verify_production_cot --random-order-bucket=none
 
+[testenv:py314-cot]
+commands=
+    py.test -k test_verify_production_cot --random-order-bucket=none
+
 [testenv:check]
 skip_install = true
 commands =