Skip to content

Commit 38c8d40

Browse files
committed
build(python): switch to pipx for better virtual env isolation
1 parent 0ea35d7 commit 38c8d40

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

xml/Dockerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,24 @@ RUN apk -U upgrade \
2121
libxslt=1.1.43-r3 \
2222
maven=3.9.9-r0 \
2323
openjdk21-jre-headless=21.0.8_p9-r0 \
24+
pipx=1.7.1-r0 \
2425
py3-pip=25.1.1-r0 \
2526
python3=3.12.11-r0 \
2627
xmlindent=0.2.17-r3 \
2728
xmlsec=1.3.7-r0 \
2829
xmlstarlet=1.6.1-r2 \
2930
xmlto=0.0.29-r0 \
30-
&& if apk -u list | grep -q -e . ; then \
31-
apk -u list ; \
31+
&& if apk -u list | tee -a /dev/stderr | grep -q -e . ; then \
3232
exit 1 ; \
3333
fi \
3434
&& apk cache clean \
3535
&& rm -rf /var/cache/apk/*
3636

37-
RUN pip3 install --no-cache-dir --upgrade --break-system-packages \
37+
RUN pipx ensurepath --global \
38+
&& pipx install --global \
3839
tcx2gpx==0.1.5 \
3940
yq==3.4.3 \
40-
&& msg="$(pip3 list --outdated | grep -i -e '^gpxpy ' -e '^tcx2gpx ' -e '^yq ' || true)" \
41-
&& if [ -n "${msg}" ]; then \
42-
>&2 echo "ERROR: outdated: ${msg}" ; \
41+
&& if pipx upgrade-all --global | tee -a /dev/stderr | grep -q -e . ; then \
4342
exit 1 ; \
4443
fi
4544

xml/docker-compose.test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ services:
1414
curl --version # curl
1515
git --version # git
1616
pip --version # py3-pip
17+
pipx --version # pipx
1718
python --version # python3
1819
yq --version # yq
1920
xmllint --version # libxml2-utils

0 commit comments

Comments
 (0)