From 503e6380957e02eff9463ff383a8ce530be5667d Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@mozilla.com>
Date: Thu, 12 Mar 2026 14:48:14 +0100
Subject: [PATCH] pushflatpakscript: update docker images to debian 13 and
 python 3.11.15

Newer pygobject requires updating gobject-introspection which means
updating the pushflatpak image to a newer base distro.
---
 pushflatpakscript/docker.d/image_setup.sh |  2 +-
 pushflatpakscript/pyproject.toml          |  2 +-
 taskcluster/kinds/docker-image/kind.yml   | 13 +++++++++----
 uv.lock                                   |  6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/pushflatpakscript/docker.d/image_setup.sh b/pushflatpakscript/docker.d/image_setup.sh
index 9f0ebda26..34c7353eb 100755
--- a/pushflatpakscript/docker.d/image_setup.sh
+++ b/pushflatpakscript/docker.d/image_setup.sh
@@ -2,5 +2,5 @@
 set -o errexit -o pipefail
 
 apt-get update
-apt-get install -y gir1.2-ostree-1.0 libgirepository1.0-dev ostree
+apt-get install -y gir1.2-ostree-1.0 libgirepository-2.0-dev ostree
 apt-get clean
diff --git a/pushflatpakscript/pyproject.toml b/pushflatpakscript/pyproject.toml
index a6c063b14..2ba0e1632 100644
--- a/pushflatpakscript/pyproject.toml
+++ b/pushflatpakscript/pyproject.toml
@@ -29,7 +29,7 @@ dev = [
 ]
 flat-manager = [
     "aiohttp",
-    "pygobject<3.52",
+    "pygobject>=3.52",
     "tenacity",
 ]
 
diff --git a/taskcluster/kinds/docker-image/kind.yml b/taskcluster/kinds/docker-image/kind.yml
index 2cf5c8535..7d792288e 100644
--- a/taskcluster/kinds/docker-image/kind.yml
+++ b/taskcluster/kinds/docker-image/kind.yml
@@ -76,8 +76,13 @@ tasks:
             SCRIPT_NAME: shipitscript
     pushapkscript:
         parent: base
+    pushflatpakscript-base:
+        definition: base
+        args:
+            PYTHON_VERSION: "3.11.15"
+            UV_VERSION: *uv_version
     pushflatpakscript:
-        parent: base
+        parent: pushflatpakscript-base
     pushmsixscript:
         definition: script
         parent: base
@@ -100,9 +105,9 @@ tasks:
     pushflatpakscript-test-py311:
         definition: base-test
         args:
-            PYTHON_VERSION: *py311
+            PYTHON_VERSION: "3.11.15"
             # Copied from pushflatpakscript/docker.d/image_setup.sh
-            APT_PACKAGES: gir1.2-ostree-1.0 libgirepository1.0-dev ostree
+            APT_PACKAGES: gir1.2-ostree-1.0 libgirepository-2.0-dev ostree
 
     signingscript-test-py311:
         definition: base-test
@@ -121,7 +126,7 @@ tasks:
         args:
             PYTHON_VERSION: *py313
             # Copied from pushflatpakscript/docker.d/image_setup.sh
-            APT_PACKAGES: gir1.2-ostree-1.0 libgirepository1.0-dev ostree
+            APT_PACKAGES: gir1.2-ostree-1.0 libgirepository-2.0-dev ostree
 
     signingscript-test-py313:
         definition: base-test
diff --git a/uv.lock b/uv.lock
index b2c514016..f2930cee5 100644
--- a/uv.lock
+++ b/uv.lock
@@ -3020,7 +3020,7 @@ dev = [
 ]
 flat-manager = [
     { name = "aiohttp" },
-    { name = "pygobject", specifier = "<3.52" },
+    { name = "pygobject", specifier = ">=3.52" },
     { name = "tenacity" },
 ]
 
@@ -3215,12 +3215,12 @@ wheels = [
 
 [[package]]
 name = "pygobject"
-version = "3.50.2"
+version = "3.56.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "pycairo" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a7/5d/f2946cc6c1baf56dee6e942af8cfa16472538a8ad9d780d9f484e7554288/pygobject-3.50.2.tar.gz", hash = "sha256:ece6b860aab77cb649fdfc6e88d8a83765e7a62f7ffd39a628d6e2a0d397a7ff", size = 1085854, upload-time = "2025-10-18T13:44:45.634Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/c9/f6/46e5d170c46a9fcf44c740bad5f919fccb3e822d7578bd24b9d8d5918312/pygobject-3.56.1.tar.gz", hash = "sha256:2ec1cc8c55c7ffeebb97e58a9bba7aa1e74611f1173628084685446804a8881a", size = 1408136, upload-time = "2026-03-11T09:26:11.017Z" }
 
 [[package]]
 name = "pyjwt"