Skip to content

Commit 36bfcaf

Browse files
committed
Remove Python 3.7 and 3.8 from test Docker image, add pypy 3.10, 3.12 and 3.13,
use 3.9 as base Python for tox.
1 parent 78d3a29 commit 36bfcaf

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

contrib/Dockerfile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,27 @@ RUN set -e && \
2929
add-apt-repository ppa:pypy/ppa && \
3030
apt-get update && \
3131
apt-get -y install \
32-
python3.8 \
3332
python3.9 \
3433
python3.10 \
3534
python3.11 \
35+
python3.12 \
36+
python3.13 \
3637
python3-dev \
37-
python3.8-dev \
3838
python3.9-dev \
3939
python3.10-dev \
4040
python3.11-dev \
41-
python3.8-distutils \
42-
python3.9-distutils \
41+
python3.12-dev \
42+
python3.13-dev \
43+
# Uses 3.10
4344
pypy3 \
4445
pypy3-dev \
4546
python3-pip \
4647
python3-distutils \
48+
python3.9-distutils \
4749
libvirt-dev \
4850
# Needed by libvirt driver
49-
pkg-config \
50-
# Needed by cryptography library for pypy
51-
libssl-dev
51+
pkg-config
5252

53-
# Workaround for zipp import error issue - https://github.com/pypa/virtualenv/issues/1630
54-
RUN python3.8 -m pip install --upgrade pip
5553

5654
COPY . /libcloud
5755

@@ -60,6 +58,6 @@ RUN if [ ! -f "/libcloud/README.rst" ]; then echo "libcloud/README.rst file not
6058
WORKDIR /libcloud
6159

6260
RUN set -e && \
63-
python3.8 -m pip install --no-cache-dir -r requirements-ci.txt
61+
python3.9 -m pip install --no-cache-dir -r requirements-ci.txt
6462

65-
CMD ["tox", "-e", "lint,isort-check,black-check,bandit,py3.7,py3.8,py3.9,py3.10,py3.11,pypypy3.8"]
63+
CMD ["tox", "-e", "lint,isort-check,black-check,bandit,py3.9,py3.10,py3.11,py3.12,py3.13,pypypy3.10"]

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ allowlist_externals =
2222
scripts/*.sh
2323
basepython =
2424
pypypy3: pypy3
25-
pypypy-3.9: pypy3.9
25+
pypypy3.9: pypy3.9
26+
pypypy3.10: pypy3.10
2627
pypyjion: pyjion
2728
{docs,checks,black,black-check,lint,pylint,bandit,mypy,micro-benchmarks,coverage,import-timings,isort,isort-check,pyupgrade}: python3.9
2829
{py3.9,py3.9-dist,py3.9-dist-wheel,py3.9-windows,integration-storage}: python3.9

0 commit comments

Comments
 (0)