Skip to content

Commit 854f58c

Browse files
authored
Merge branch 'atlassian-api:master' into master
2 parents c880174 + fb9c354 commit 854f58c

File tree

4 files changed

+17
-1
lines changed

4 files changed

+17
-1
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.6', '3.7', '3.8', '3.9', '3.11', '3.12' ]
21+
python-version: [ '3.6', '3.7', '3.8', '3.9', '3.11', '3.12', '3.13' ]
2222

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

Dockerfile.qa

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ RUN apt install -y \
2626
python$PYTHON_VERSION-dev \
2727
python3-pip
2828

29+
# Install curl
30+
RUN apt-get install -y curl
31+
2932
# install distutils.util
3033
RUN if [ $PYTHON_VERSION = '3.7' ] ; then \
3134
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ;\
@@ -40,6 +43,9 @@ RUN if [ $PYTHON_VERSION = '3.7' ] ; then \
4043
elif [ $PYTHON_VERSION = '3.12' ] ; then \
4144
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
4245
curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
46+
elif [ $PYTHON_VERSION = '3.13' ] ; then \
47+
apt install -y python$PYTHON_VERSION-distutils python3-distutils-extra python3-apt --reinstall ; \
48+
curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VERSION ; \
4349
else \
4450
apt install -y python3-distutils python3-distutils-extra python3-apt --reinstall ; \
4551
fi

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ docker-qa-build: Dockerfile.qa requirements.txt requirements-dev.txt
5050
--build-arg PYTHON_VERSION=$(PYTHON_VERSION) \
5151
--file $< .
5252

53+
docker-fmt: docker-qa-build
54+
docker run --rm -v `pwd`:/atlassian-python-api $(QA_CONTAINER) tox -e black_fmt
55+
5356
docker-atlassian-standalone: Dockerfile.standalone
5457
docker build \
5558
--tag $(ATLASSIAN_SDK) \

tox.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ skip_install = true
4040
deps = black
4141
commands = black --check --diff {[base]linting_targets} --exclude __pycache__
4242

43+
[testenv:black_fmt]
44+
basepython = python3
45+
target-version = ["py37"]
46+
skip_install = true
47+
deps = black
48+
commands = black {[base]linting_targets} --exclude __pycache__
49+
4350
[testenv:mypy]
4451
basepython = python3
4552
skip_install = true

0 commit comments

Comments
 (0)