From 38c96a22d0c8e7abe70f0a9f08b58c969f9a7745 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Tue, 28 Jul 2026 11:19:52 +0200 Subject: [PATCH] Bug 2058413 - update k8s scriptworkers to python 3.14 --- addonscript/tox.ini | 4 +- balrogscript/tox.ini | 4 +- beetmoverscript/tox.ini | 4 +- bitrisescript/tox.ini | 4 +- bouncerscript/tox.ini | 4 +- configloader/tox.ini | 4 +- githubscript/tox.ini | 4 +- landoscript/tox.ini | 4 +- pushapkscript/tox.ini | 4 +- pushflatpakscript/tox.ini | 4 +- pushmsixscript/tox.ini | 4 +- scriptworker_client/tox.ini | 2 +- shipitscript/tox.ini | 4 +- signingscript/tox.ini | 4 +- taskcluster/kinds/check/kind.yml | 2 +- taskcluster/kinds/docker-image/kind.yml | 26 +------ taskcluster/kinds/tox/kind.yml | 8 +- tox.ini | 97 ++++--------------------- treescript/tox.ini | 4 +- 19 files changed, 55 insertions(+), 136 deletions(-) diff --git a/addonscript/tox.ini b/addonscript/tox.ini index e731e0c8b..5292a76a9 100644 --- a/addonscript/tox.ini +++ b/addonscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [coverage:run] diff --git a/balrogscript/tox.ini b/balrogscript/tox.ini index c5a48126c..10d7ad23c 100644 --- a/balrogscript/tox.ini +++ b/balrogscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/beetmoverscript/tox.ini b/beetmoverscript/tox.ini index 3dc761018..3599c0bdc 100644 --- a/beetmoverscript/tox.ini +++ b/beetmoverscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/bitrisescript/tox.ini b/bitrisescript/tox.ini index a30312164..8b8e00ee6 100644 --- a/bitrisescript/tox.ini +++ b/bitrisescript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/bouncerscript/tox.ini b/bouncerscript/tox.ini index 924bbd1bb..6e7579c8a 100644 --- a/bouncerscript/tox.ini +++ b/bouncerscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/configloader/tox.ini b/configloader/tox.ini index 9dba641ee..fd5b23b03 100644 --- a/configloader/tox.ini +++ b/configloader/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [coverage:run] diff --git a/githubscript/tox.ini b/githubscript/tox.ini index 2bb06074a..771f99b78 100644 --- a/githubscript/tox.ini +++ b/githubscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/landoscript/tox.ini b/landoscript/tox.ini index 7ce9e576f..04bc6969b 100644 --- a/landoscript/tox.ini +++ b/landoscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [coverage:run] diff --git a/pushapkscript/tox.ini b/pushapkscript/tox.ini index 04d7cbd32..814b48862 100644 --- a/pushapkscript/tox.ini +++ b/pushapkscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] setenv = @@ -18,7 +18,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/pushflatpakscript/tox.ini b/pushflatpakscript/tox.ini index 3f86ca07a..684f66eef 100644 --- a/pushflatpakscript/tox.ini +++ b/pushflatpakscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -20,7 +20,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/pushmsixscript/tox.ini b/pushmsixscript/tox.ini index 2be87253c..02728595a 100644 --- a/pushmsixscript/tox.ini +++ b/pushmsixscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] setenv = @@ -18,7 +18,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/scriptworker_client/tox.ini b/scriptworker_client/tox.ini index 2099e376f..45065b68a 100644 --- a/scriptworker_client/tox.ini +++ b/scriptworker_client/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311,mypy +envlist = py314,mypy [testenv] setenv = diff --git a/shipitscript/tox.ini b/shipitscript/tox.ini index 10c42243b..b9a7e6dc7 100644 --- a/shipitscript/tox.ini +++ b/shipitscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] setenv = @@ -18,7 +18,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/signingscript/tox.ini b/signingscript/tox.ini index bb8ae6d2d..2c37c3c70 100644 --- a/signingscript/tox.ini +++ b/signingscript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] depends = clean @@ -20,7 +20,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest] diff --git a/taskcluster/kinds/check/kind.yml b/taskcluster/kinds/check/kind.yml index e67233d39..a113ce6ad 100644 --- a/taskcluster/kinds/check/kind.yml +++ b/taskcluster/kinds/check/kind.yml @@ -19,7 +19,7 @@ task-defaults: code-review: true worker-type: b-linux worker: - docker-image: {in-tree: 'python311'} + docker-image: {in-tree: 'python314'} max-run-time: 1800 tasks: diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml index fbe304086..f587a61f7 100644 --- a/taskcluster/kinds/docker-image/kind.yml +++ b/taskcluster/kinds/docker-image/kind.yml @@ -32,7 +32,7 @@ tasks: base: args: - PYTHON_VERSION: *py311 + PYTHON_VERSION: *py314 UV_VERSION: *uv_version addonscript: definition: script @@ -84,35 +84,13 @@ tasks: args: SCRIPT_NAME: pushmsixscript signingscript: - # python:3.11.15-trixie docker image contains osslsigncode 2.9. + # python:3.14.3-slim-trixie docker image contains osslsigncode 2.9. # if the image changes, verify version of osslsigncode and make sure winsign works as well parent: base treescript: parent: base # Testing images - pushapkscript-test-py311: - definition: base-test - args: - PYTHON_VERSION: *py311 - UV_VERSION: *uv_version - APT_PACKAGES: default-jre-headless - - pushflatpakscript-test-py311: - definition: base-test - args: - PYTHON_VERSION: *py311 - UV_VERSION: *uv_version - # Copied from pushflatpakscript/docker.d/image_setup.sh - APT_PACKAGES: gir1.2-ostree-1.0 libgirepository-2.0-dev ostree - - signingscript-test-py311: - definition: base-test - args: - PYTHON_VERSION: *py311 - UV_VERSION: *uv_version - APT_PACKAGES: osslsigncode cmake make clang gpg gpgv - pushapkscript-test-py314: definition: base-test args: diff --git a/taskcluster/kinds/tox/kind.yml b/taskcluster/kinds/tox/kind.yml index 72e2f15e7..72e27f459 100644 --- a/taskcluster/kinds/tox/kind.yml +++ b/taskcluster/kinds/tox/kind.yml @@ -43,7 +43,7 @@ task-defaults: - tox.ini - uv.lock matrix: - python: ["311", "314"] + python: ["314"] tasks: addonscript: @@ -65,6 +65,8 @@ tasks: configloader: resources: - configloader + matrix: + python: ["311"] githubscript: resources: - githubscript @@ -90,6 +92,8 @@ tasks: - iscript - scriptworker_client - vendored/mozbuild + matrix: + python: ["311"] landoscript: resources: - landoscript @@ -110,6 +114,8 @@ tasks: scriptworker_client: resources: - scriptworker_client + matrix: + python: ["311"] shipitscript: resources: - shipitscript diff --git a/tox.ini b/tox.ini index 1f082e57c..1148b2557 100644 --- a/tox.ini +++ b/tox.ini @@ -1,22 +1,22 @@ [tox] envlist = - addonscript-py311 - balrogscript-py311 - beetmoverscript-py311 - bitrisescript-py311 - bouncerscript-py311 - configloader-py311 + addonscript-py314 + balrogscript-py314 + beetmoverscript-py314 + bitrisescript-py314 + bouncerscript-py314 + configloader-py314 iscript-py311 - githubscript-py311 - init-py311 - landoscript-py311 - pushapkscript-py311 - pushflatpakscript-py311 - pushmsixscript-py311 - scriptworker_client-py311 - shipitscript-py311 - signingscript-py311 - treescript-py311 + githubscript-py314 + init-py314 + landoscript-py314 + pushapkscript-py314 + pushflatpakscript-py314 + pushmsixscript-py314 + scriptworker_client-py314 + shipitscript-py314 + signingscript-py314 + treescript-py314 ruff skipsdist = true @@ -24,31 +24,6 @@ skipsdist = true [testenv] runner = uv-venv-lock-runner -[testenv:addonscript-py311] -changedir = {toxinidir}/addonscript -commands = - tox -e py311 - -[testenv:balrogscript-py311] -changedir = {toxinidir}/balrogscript -commands = - tox -e py311 - -[testenv:beetmoverscript-py311] -changedir = {toxinidir}/beetmoverscript -commands = - tox -e py311 - -[testenv:bitrisescript-py311] -changedir = {toxinidir}/bitrisescript -commands = - tox -e py311 - -[testenv:bouncerscript-py311] -changedir = {toxinidir}/bouncerscript -commands = - tox -e py311 - [testenv:configloader-py311] changedir = {toxinidir}/configloader commands = @@ -63,51 +38,11 @@ changedir = {toxinidir}/iscript commands = tox -e py311 -[testenv:githubscript-py311] -changedir = {toxinidir}/githubscript -commands = - tox -e py311 - -[testenv:landoscript-py311] -changedir = {toxinidir}/landoscript -commands = - tox -e py311 - -[testenv:pushapkscript-py311] -changedir = {toxinidir}/pushapkscript -commands = - tox -e py311 - -[testenv:pushflatpakscript-py311] -changedir = {toxinidir}/pushflatpakscript -commands = - tox -e py311 - -[testenv:pushmsixscript-py311] -changedir = {toxinidir}/pushmsixscript -commands = - tox -e py311 - [testenv:scriptworker_client-py311] changedir = {toxinidir}/scriptworker_client commands = tox -e py311,mypy -[testenv:shipitscript-py311] -changedir = {toxinidir}/shipitscript -commands = - tox -e py311 - -[testenv:signingscript-py311] -changedir = {toxinidir}/signingscript -commands = - tox -e py311 - -[testenv:treescript-py311] -changedir = {toxinidir}/treescript -commands = - tox -e py311 - [testenv:addonscript-py314] changedir = {toxinidir}/addonscript commands = diff --git a/treescript/tox.ini b/treescript/tox.ini index cb4705b9b..f40d6255d 100644 --- a/treescript/tox.ini +++ b/treescript/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py311 +envlist = py314 [testenv] setenv = @@ -19,7 +19,7 @@ depends = [testenv:report] skip_install = true commands = coverage report -m -depends = py311 +depends = py314 parallel_show_output = true [pytest]