Skip to content

Commit 066c78d

Browse files
committed
Bump all dependencies, uv and base images
2 parents 1fa59e2 + 67d4b97 commit 066c78d

12 files changed

Lines changed: 468 additions & 319 deletions

File tree

.github/workflows/python-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ jobs:
88
runs-on: ubuntu-latest
99
strategy:
1010
matrix:
11-
python-version: ["3.10", "3.11", "3.12", "3.13"]
11+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1212
dependency-extras: ["", "--extra all"]
1313

1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: Install uv
17-
run: pipx install 'uv==0.7.14'
17+
run: pipx install 'uv==0.9.17'
1818
- name: Set up Python ${{ matrix.python-version }}
1919
uses: actions/setup-python@v4
2020
with:

.github/workflows/python-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Install uv
16-
run: pipx install 'uv==0.5.31'
16+
run: pipx install 'uv==0.9.17'
1717
- name: Publish package
1818
run: |
1919
uv build

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ DOCKER_TEST_TAG = $(SERVICE_LC)-$(SERVICE_ID_SHORT).test
1313
CACHEBASE ?= ~/.cache/$(SERVICE).make-cache
1414
CACHEDIR = $(CACHEBASE)/$(SERVICE_ID_FULL)
1515

16-
# run-arch-tests, run-python3.8-tests, ...
16+
# run-arch-tests, run-python3.10-tests, run-python3.11-tests, ...
1717
DOCKER_TESTS := $(addsuffix -tests, $(addprefix run-,$(ALL_DOCKER_FILES)))
1818

1919
.SECONDARY: # Do not remove intermediate files. We need them for caching!

dockerfiles/arch

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
1-
# archlinux:latest as of 23 June 2025
2-
FROM archlinux@sha256:a921b6864609280975d8269df323c2f4f478cdc9d0f5479e70c3fb5e710d1b11
1+
FROM archlinux:latest
32

43
RUN pacman -Syy --noconfirm archlinux-keyring
54
RUN rm -fr /etc/pacman.d/gnupg
65
RUN pacman-key --init
76
RUN pacman-key --populate archlinux
87

98
# Provide relevant binaries
10-
RUN pacman -Sy --noconfirm btrfs-progs cryptsetup make python python-pipx restic rsync sudo
9+
RUN pacman -Sy --noconfirm \
10+
btrfs-progs \
11+
cryptsetup \
12+
make \
13+
python \
14+
python-pipx \
15+
python-uv \
16+
restic \
17+
rsync \
18+
sudo
1119

1220
# Create a new user with a group that is not the username. This is required to
1321
# ensure that resetting the ownership of restic's backup repository uses the
@@ -26,9 +34,6 @@ RUN gpasswd -a testuser sudo
2634
USER testuser
2735
ENV USER=testuser
2836

29-
ENV PATH="/home/testuser/.local/bin:$PATH"
30-
RUN pipx install uv
31-
3237
# Setup production dependencies
3338
WORKDIR /project
3439
RUN touch README.md # Content is not relevant for this Dockerfile

dockerfiles/debian

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim
1+
FROM debian:trixie-slim
22

33
# Provide excecutables
44
ENV DEBIAN_FRONTEND=noninteractive

dockerfiles/python3.10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt update && \
77
apt autoclean
88

99
# Setup uv
10-
ENV UV_VERSION=0.7.15
10+
ENV UV_VERSION=0.9.17
1111
RUN python3 -m pip install "uv==$UV_VERSION"
1212

1313
# Setup production dependencies

dockerfiles/python3.11

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt update && \
77
apt autoclean
88

99
# Setup uv
10-
ENV UV_VERSION=0.7.15
10+
ENV UV_VERSION=0.9.17
1111
RUN python3 -m pip install "uv==$UV_VERSION"
1212

1313
# Setup production dependencies

dockerfiles/python3.12

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt update && \
77
apt autoclean
88

99
# Setup uv
10-
ENV UV_VERSION=0.7.15
10+
ENV UV_VERSION=0.9.17
1111
RUN python3 -m pip install "uv==$UV_VERSION"
1212

1313
# Setup production dependencies

dockerfiles/python3.13

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt update && \
77
apt autoclean
88

99
# Setup uv
10-
ENV UV_VERSION=0.7.15
10+
ENV UV_VERSION=0.9.17
1111
RUN python3 -m pip install "uv==$UV_VERSION"
1212

1313
# Setup production dependencies

dockerfiles/python3.14

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM python:3.14
2+
3+
# Provide excecutables
4+
ENV DEBIAN_FRONTEND=noninteractive
5+
RUN apt update && \
6+
apt install -y btrfs-progs cryptsetup make restic rsync sudo && \
7+
apt autoclean
8+
9+
# Setup uv
10+
ENV UV_VERSION=0.9.17
11+
RUN python3 -m pip install "uv==$UV_VERSION"
12+
13+
# Setup production dependencies
14+
WORKDIR /project
15+
RUN touch README.md # Content is not relevant for this Dockerfile
16+
COPY pyproject.toml uv.lock ./
17+
RUN uv sync --frozen --no-install-project
18+
19+
# Install project
20+
COPY src/ src/
21+
RUN uv sync --frozen
22+
23+
# Create /dev/disk/by-uuid/. It is required by the test suite but not available
24+
# in Docker containers by default.
25+
CMD mkdir -p /dev/disk/by-uuid/ && uv run pytest --no-cov --stepwise .

0 commit comments

Comments
 (0)