Skip to content

Commit 4cf6fdd

Browse files
committed
Fix make docker-test by removing python 3.6. Improve docker image build.
python 3.6 is no longer supported[1], and is not longer supported by get-pip.py [2] The docker image build is improved by exiting on error inside shell for loop. [1] https://peps.python.org/pep-0494/ [2] https://pip.pypa.io/en/stable/installation/#compatibility
1 parent b74742e commit 4cf6fdd

2 files changed

Lines changed: 6 additions & 5 deletions

File tree

Dockerfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
1616
build-essential \
1717
python3-pip \
1818
python3 \
19-
python3.6 \
2019
python3.7 \
20+
python3.7-distutils \
2121
python3.9 \
2222
python3.9-distutils \
2323
python3.10 \
@@ -26,9 +26,10 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
2626
dbus \
2727
python3-gi
2828

29-
RUN pip3 install 'yapf==0.31' 'flake8==4.0.1' && \
30-
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
31-
for py in python3 python3.6 python3.7 python3.9 python3.10; do \
29+
RUN set -e -x; \
30+
pip3 install 'yapf==0.31' 'flake8==4.0.1'; \
31+
curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py; \
32+
for py in python3.7 python3.8 python3.9 python3.10; do \
3233
${py} get-pip.py; \
3334
PYTHONPATH=/usr/lib/${py}/site-packages ${py} -m pip install \
3435
'pytest==6.2.5' \

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ format:
1313
python3 -m yapf -rip $(source_dirs)
1414

1515
test:
16-
for py in python3.6 python3.7 python3.9 python3.10 python3.8 ; do \
16+
for py in python3.7 python3.9 python3.10 python3.8 ; do \
1717
if hash $${py}; then \
1818
PYTHONPATH=/usr/lib/$${py}/site-packages dbus-run-session $${py} -m pytest -sv --cov=dbus_next || exit 1 ; \
1919
fi \

0 commit comments

Comments
 (0)