Skip to content

Commit f5b5737

Browse files
authored
Fix CI build (#1605)
1 parent 0b86336 commit f5b5737

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
python-version: [ '3.9', '3.11', '3.12', '3.13' ]
21+
python-version: [ '3.9', '3.10', '3.11', '3.12', '3.13' ]
2222

2323
steps:
2424
- uses: actions/checkout@v4

Dockerfile.qa

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:22.04
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
ARG PYTHON_VERSION
@@ -22,9 +22,10 @@ RUN if [ $PYTHON_VERSION = '2.7' ] ; then \
2222
fi
2323

2424
# Install python development
25-
RUN apt install -y \
26-
python$PYTHON_VERSION-dev \
27-
python3-pip
25+
RUN apt-get update && \
26+
apt-get install -y \
27+
python$PYTHON_VERSION-dev \
28+
python3-pip
2829

2930
# Install curl
3031
RUN apt-get install -y curl
@@ -34,6 +35,9 @@ RUN if [ $PYTHON_VERSION = '3.7' ] ; then \
3435
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
3536
elif [ $PYTHON_VERSION = '3.6' ] ; then \
3637
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
38+
elif [ $PYTHON_VERSION = '3.9' ] ; then \
39+
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
40+
curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
3741
elif [ $PYTHON_VERSION = '3.10' ] ; then \
3842
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
3943
curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ docker-qa: | docker-qa-build
4646

4747
docker-qa-build: Dockerfile.qa requirements.txt requirements-dev.txt
4848
docker build \
49+
--pull \
4950
--tag $(QA_CONTAINER) \
5051
--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
5152
--file $< .
@@ -55,5 +56,6 @@ docker-fmt: docker-qa-build
5556

5657
docker-atlassian-standalone: Dockerfile.standalone
5758
docker build \
59+
--pull \
5860
--tag $(ATLASSIAN_SDK) \
5961
--file $< .

atlassian/service_desk.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ def get_request_types(self, service_desk_id):
166166
f"rest/servicedeskapi/servicedesk/{service_desk_id}/requesttype",
167167
headers=self.experimental_headers,
168168
)
169+
169170
def get_request_type(self, service_desk_id, request_type_id):
170171
"""
171172
Fetches detailed information about a specific request type within a service desk.

0 commit comments

Comments
 (0)