From a8a2a2a439da7c323eba1a0d9456edc7f5dc8bd8 Mon Sep 17 00:00:00 2001
From: offa <8887756+offa@users.noreply.github.com>
Date: Mon, 1 Dec 2025 18:09:43 +0100
Subject: [PATCH] Fix CI build

---
 .github/workflows/test.yml |  2 +-
 Dockerfile.qa              | 12 ++++++++----
 Makefile                   |  2 ++
 atlassian/service_desk.py  |  1 +
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 691f9db79..979937cee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: [ '3.9', '3.11', '3.12', '3.13' ]
+        python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
 
     steps:
       - uses: actions/checkout@v4
diff --git a/Dockerfile.qa b/Dockerfile.qa
index 5ebb22e49..cf7b2ab11 100644
--- a/Dockerfile.qa
+++ b/Dockerfile.qa
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG PYTHON_VERSION
@@ -22,9 +22,10 @@ RUN if [ $PYTHON_VERSION = '2.7' ] ; then \
   fi
 
 # Install python development
-RUN apt install -y \
-  python$PYTHON_VERSION-dev \
-  python3-pip
+RUN apt-get update && \
+  apt-get install -y \
+    python$PYTHON_VERSION-dev \
+    python3-pip
 
 # Install curl
 RUN apt-get install -y curl
@@ -34,6 +35,9 @@ RUN if [ $PYTHON_VERSION = '3.7' ] ; then \
   apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
   elif [ $PYTHON_VERSION = '3.6' ] ; then \
   apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
+  elif [ $PYTHON_VERSION = '3.9' ] ; then \
+  apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
+  curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
   elif [ $PYTHON_VERSION = '3.10' ] ; then \
   apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
   curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
diff --git a/Makefile b/Makefile
index c2d0b79a5..ce5773044 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@ docker-qa: | docker-qa-build
 
 docker-qa-build: Dockerfile.qa requirements.txt requirements-dev.txt
 	docker build \
+		--pull \
 		--tag $(QA_CONTAINER) \
 		--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
 		--file $< .
@@ -55,5 +56,6 @@ docker-fmt: docker-qa-build
 
 docker-atlassian-standalone: Dockerfile.standalone
 	docker build \
+		--pull \
 		--tag $(ATLASSIAN_SDK) \
 		--file $< .
diff --git a/atlassian/service_desk.py b/atlassian/service_desk.py
index 1cc4fbca3..700df7a18 100644
--- a/atlassian/service_desk.py
+++ b/atlassian/service_desk.py
@@ -166,6 +166,7 @@ def get_request_types(self, service_desk_id):
             f"rest/servicedeskapi/servicedesk/{service_desk_id}/requesttype",
             headers=self.experimental_headers,
         )
+
     def get_request_type(self, service_desk_id, request_type_id):
         """
         Fetches detailed information about a specific request type within a service desk.