Skip to content

Commit 4548cec

Browse files
WuodanWuodan
committed
Merge remote-tracking branch 'upstream/main' into upstream-PR/02-replace-qemu-with-arm64-runner
# Conflicts: # .github/workflows/build.yaml
2 parents f775b63 + 61b0d53 commit 4548cec

8 files changed

Lines changed: 391 additions & 391 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3232
with:
3333
fetch-depth: 2
34-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
34+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
3535
with:
3636
enable-cache: true
3737
- name: Generate build matrix
@@ -57,7 +57,7 @@ jobs:
5757
steps:
5858
# Setup
5959
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
60-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
60+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6161
with:
6262
enable-cache: true
6363
- name: Generate Dockerfile from config
@@ -69,7 +69,7 @@ jobs:
6969

7070
# Build
7171
- name: Build image
72-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
72+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
7373
with:
7474
context: .
7575
file: dockerfiles/${{ matrix.key }}.Dockerfile
@@ -87,7 +87,7 @@ jobs:
8787
8888
# Push
8989
- name: Login to Docker Hub
90-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
90+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
9191
with:
9292
username: ${{ secrets.DOCKERHUB_USERNAME }}
9393
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -112,7 +112,7 @@ jobs:
112112
docker manifest create "${IMAGE_NAME}:${{ matrix.key }}" "${refs[@]}"
113113
114114
- name: Login to Docker Hub
115-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
115+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
116116
with:
117117
username: ${{ secrets.DOCKERHUB_USERNAME }}
118118
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -140,7 +140,7 @@ jobs:
140140
>> "builds/${{ matrix.key }}.json"
141141
142142
- name: Upload build context
143-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
143+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
144144
with:
145145
name: build-${{ matrix.key }}
146146
path: builds/*
@@ -153,7 +153,7 @@ jobs:
153153
needs: [deploy]
154154
steps:
155155
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
156-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
156+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
157157
with:
158158
enable-cache: true
159159

‎.github/workflows/tests.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
12-
- uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
12+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
1313
with:
1414
enable-cache: true
1515
- run: uv run ./bin/lint

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.15.9
3+
rev: v0.15.13
44
hooks:
55
- id: ruff
66
args: [--fix]
77
- id: ruff-format
88
- repo: https://github.com/python-jsonschema/check-jsonschema
9-
rev: 0.37.1
9+
rev: 0.37.2
1010
hooks:
1111
- id: check-github-workflows
1212
- id: check-renovate

‎.python-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.14.2
1+
3.14.5

‎README.md‎

Lines changed: 70 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[![Pulls](https://img.shields.io/docker/pulls/nikolaik/python-nodejs.svg?style=flat-square)](https://hub.docker.com/r/nikolaik/python-nodejs/)
44
[![CircleCI](https://img.shields.io/circleci/project/github/nikolaik/docker-python-nodejs.svg?style=flat-square)](https://circleci.com/gh/nikolaik/docker-python-nodejs)
55

6-
Last updated by bot: 2026-04-02
6+
Last updated by bot: 2026-05-14
77

88
The `latest` tag is currently:
99

@@ -24,86 +24,86 @@ To use a specific combination of Python and Node.js see the following table of a
2424

2525
Tag | Python version | Node.js version | Distro
2626
--- | --- | --- | ---
27-
`python3.14-nodejs25` | 3.14.3 | 25.9.0 | trixie
28-
`python3.14-nodejs25-bookworm` | 3.14.3 | 25.9.0 | bookworm
29-
`python3.14-nodejs25-slim` | 3.14.3 | 25.9.0 | slim
30-
`python3.14-nodejs25-alpine` | 3.14.3 | 25.9.0 | alpine
31-
`python3.14-nodejs24` | 3.14.3 | 24.14.1 | trixie
32-
`python3.14-nodejs24-bookworm` | 3.14.3 | 24.14.1 | bookworm
33-
`python3.14-nodejs24-slim` | 3.14.3 | 24.14.1 | slim
34-
`python3.14-nodejs24-alpine` | 3.14.3 | 24.14.1 | alpine
35-
`python3.14-nodejs22` | 3.14.3 | 22.22.2 | trixie
36-
`python3.14-nodejs22-bookworm` | 3.14.3 | 22.22.2 | bookworm
37-
`python3.14-nodejs22-slim` | 3.14.3 | 22.22.2 | slim
38-
`python3.14-nodejs22-alpine` | 3.14.3 | 22.22.2 | alpine
39-
`python3.14-nodejs20` | 3.14.3 | 20.20.2 | trixie
40-
`python3.14-nodejs20-bookworm` | 3.14.3 | 20.20.2 | bookworm
41-
`python3.14-nodejs20-slim` | 3.14.3 | 20.20.2 | slim
42-
`python3.14-nodejs20-alpine` | 3.14.3 | 20.20.2 | alpine
43-
`python3.13-nodejs25` | 3.13.12 | 25.9.0 | trixie
44-
`python3.13-nodejs25-bookworm` | 3.13.12 | 25.9.0 | bookworm
45-
`python3.13-nodejs25-slim` | 3.13.12 | 25.9.0 | slim
46-
`python3.13-nodejs25-alpine` | 3.13.12 | 25.9.0 | alpine
47-
`python3.13-nodejs24` | 3.13.12 | 24.14.1 | trixie
48-
`python3.13-nodejs24-bookworm` | 3.13.12 | 24.14.1 | bookworm
49-
`python3.13-nodejs24-slim` | 3.13.12 | 24.14.1 | slim
50-
`python3.13-nodejs24-alpine` | 3.13.12 | 24.14.1 | alpine
51-
`python3.13-nodejs22` | 3.13.12 | 22.22.2 | trixie
52-
`python3.13-nodejs22-bookworm` | 3.13.12 | 22.22.2 | bookworm
53-
`python3.13-nodejs22-slim` | 3.13.12 | 22.22.2 | slim
54-
`python3.13-nodejs22-alpine` | 3.13.12 | 22.22.2 | alpine
55-
`python3.13-nodejs20` | 3.13.12 | 20.20.2 | trixie
56-
`python3.13-nodejs20-bookworm` | 3.13.12 | 20.20.2 | bookworm
57-
`python3.13-nodejs20-slim` | 3.13.12 | 20.20.2 | slim
58-
`python3.13-nodejs20-alpine` | 3.13.12 | 20.20.2 | alpine
27+
`python3.14-nodejs26` | 3.14.5 | 26.1.0 | trixie
28+
`python3.14-nodejs26-bookworm` | 3.14.5 | 26.1.0 | bookworm
29+
`python3.14-nodejs26-slim` | 3.14.5 | 26.1.0 | slim
30+
`python3.14-nodejs26-alpine` | 3.14.5 | 26.1.0 | alpine
31+
`python3.14-nodejs25` | 3.14.5 | 25.9.0 | trixie
32+
`python3.14-nodejs25-bookworm` | 3.14.5 | 25.9.0 | bookworm
33+
`python3.14-nodejs25-slim` | 3.14.5 | 25.9.0 | slim
34+
`python3.14-nodejs25-alpine` | 3.14.5 | 25.9.0 | alpine
35+
`python3.14-nodejs24` | 3.14.5 | 24.15.0 | trixie
36+
`python3.14-nodejs24-bookworm` | 3.14.5 | 24.15.0 | bookworm
37+
`python3.14-nodejs24-slim` | 3.14.5 | 24.15.0 | slim
38+
`python3.14-nodejs24-alpine` | 3.14.5 | 24.15.0 | alpine
39+
`python3.14-nodejs22` | 3.14.5 | 22.22.3 | trixie
40+
`python3.14-nodejs22-bookworm` | 3.14.5 | 22.22.3 | bookworm
41+
`python3.14-nodejs22-slim` | 3.14.5 | 22.22.3 | slim
42+
`python3.14-nodejs22-alpine` | 3.14.5 | 22.22.3 | alpine
43+
`python3.13-nodejs26` | 3.13.13 | 26.1.0 | trixie
44+
`python3.13-nodejs26-bookworm` | 3.13.13 | 26.1.0 | bookworm
45+
`python3.13-nodejs26-slim` | 3.13.13 | 26.1.0 | slim
46+
`python3.13-nodejs26-alpine` | 3.13.13 | 26.1.0 | alpine
47+
`python3.13-nodejs25` | 3.13.13 | 25.9.0 | trixie
48+
`python3.13-nodejs25-bookworm` | 3.13.13 | 25.9.0 | bookworm
49+
`python3.13-nodejs25-slim` | 3.13.13 | 25.9.0 | slim
50+
`python3.13-nodejs25-alpine` | 3.13.13 | 25.9.0 | alpine
51+
`python3.13-nodejs24` | 3.13.13 | 24.15.0 | trixie
52+
`python3.13-nodejs24-bookworm` | 3.13.13 | 24.15.0 | bookworm
53+
`python3.13-nodejs24-slim` | 3.13.13 | 24.15.0 | slim
54+
`python3.13-nodejs24-alpine` | 3.13.13 | 24.15.0 | alpine
55+
`python3.13-nodejs22` | 3.13.13 | 22.22.3 | trixie
56+
`python3.13-nodejs22-bookworm` | 3.13.13 | 22.22.3 | bookworm
57+
`python3.13-nodejs22-slim` | 3.13.13 | 22.22.3 | slim
58+
`python3.13-nodejs22-alpine` | 3.13.13 | 22.22.3 | alpine
59+
`python3.12-nodejs26` | 3.12.13 | 26.1.0 | trixie
60+
`python3.12-nodejs26-bookworm` | 3.12.13 | 26.1.0 | bookworm
61+
`python3.12-nodejs26-slim` | 3.12.13 | 26.1.0 | slim
62+
`python3.12-nodejs26-alpine` | 3.12.13 | 26.1.0 | alpine
5963
`python3.12-nodejs25` | 3.12.13 | 25.9.0 | trixie
6064
`python3.12-nodejs25-bookworm` | 3.12.13 | 25.9.0 | bookworm
6165
`python3.12-nodejs25-slim` | 3.12.13 | 25.9.0 | slim
6266
`python3.12-nodejs25-alpine` | 3.12.13 | 25.9.0 | alpine
63-
`python3.12-nodejs24` | 3.12.13 | 24.14.1 | trixie
64-
`python3.12-nodejs24-bookworm` | 3.12.13 | 24.14.1 | bookworm
65-
`python3.12-nodejs24-slim` | 3.12.13 | 24.14.1 | slim
66-
`python3.12-nodejs24-alpine` | 3.12.13 | 24.14.1 | alpine
67-
`python3.12-nodejs22` | 3.12.13 | 22.22.2 | trixie
68-
`python3.12-nodejs22-bookworm` | 3.12.13 | 22.22.2 | bookworm
69-
`python3.12-nodejs22-slim` | 3.12.13 | 22.22.2 | slim
70-
`python3.12-nodejs22-alpine` | 3.12.13 | 22.22.2 | alpine
71-
`python3.12-nodejs20` | 3.12.13 | 20.20.2 | trixie
72-
`python3.12-nodejs20-bookworm` | 3.12.13 | 20.20.2 | bookworm
73-
`python3.12-nodejs20-slim` | 3.12.13 | 20.20.2 | slim
74-
`python3.12-nodejs20-alpine` | 3.12.13 | 20.20.2 | alpine
67+
`python3.12-nodejs24` | 3.12.13 | 24.15.0 | trixie
68+
`python3.12-nodejs24-bookworm` | 3.12.13 | 24.15.0 | bookworm
69+
`python3.12-nodejs24-slim` | 3.12.13 | 24.15.0 | slim
70+
`python3.12-nodejs24-alpine` | 3.12.13 | 24.15.0 | alpine
71+
`python3.12-nodejs22` | 3.12.13 | 22.22.3 | trixie
72+
`python3.12-nodejs22-bookworm` | 3.12.13 | 22.22.3 | bookworm
73+
`python3.12-nodejs22-slim` | 3.12.13 | 22.22.3 | slim
74+
`python3.12-nodejs22-alpine` | 3.12.13 | 22.22.3 | alpine
75+
`python3.11-nodejs26` | 3.11.15 | 26.1.0 | trixie
76+
`python3.11-nodejs26-bookworm` | 3.11.15 | 26.1.0 | bookworm
77+
`python3.11-nodejs26-slim` | 3.11.15 | 26.1.0 | slim
78+
`python3.11-nodejs26-alpine` | 3.11.15 | 26.1.0 | alpine
7579
`python3.11-nodejs25` | 3.11.15 | 25.9.0 | trixie
7680
`python3.11-nodejs25-bookworm` | 3.11.15 | 25.9.0 | bookworm
7781
`python3.11-nodejs25-slim` | 3.11.15 | 25.9.0 | slim
7882
`python3.11-nodejs25-alpine` | 3.11.15 | 25.9.0 | alpine
79-
`python3.11-nodejs24` | 3.11.15 | 24.14.1 | trixie
80-
`python3.11-nodejs24-bookworm` | 3.11.15 | 24.14.1 | bookworm
81-
`python3.11-nodejs24-slim` | 3.11.15 | 24.14.1 | slim
82-
`python3.11-nodejs24-alpine` | 3.11.15 | 24.14.1 | alpine
83-
`python3.11-nodejs22` | 3.11.15 | 22.22.2 | trixie
84-
`python3.11-nodejs22-bookworm` | 3.11.15 | 22.22.2 | bookworm
85-
`python3.11-nodejs22-slim` | 3.11.15 | 22.22.2 | slim
86-
`python3.11-nodejs22-alpine` | 3.11.15 | 22.22.2 | alpine
87-
`python3.11-nodejs20` | 3.11.15 | 20.20.2 | trixie
88-
`python3.11-nodejs20-bookworm` | 3.11.15 | 20.20.2 | bookworm
89-
`python3.11-nodejs20-slim` | 3.11.15 | 20.20.2 | slim
90-
`python3.11-nodejs20-alpine` | 3.11.15 | 20.20.2 | alpine
83+
`python3.11-nodejs24` | 3.11.15 | 24.15.0 | trixie
84+
`python3.11-nodejs24-bookworm` | 3.11.15 | 24.15.0 | bookworm
85+
`python3.11-nodejs24-slim` | 3.11.15 | 24.15.0 | slim
86+
`python3.11-nodejs24-alpine` | 3.11.15 | 24.15.0 | alpine
87+
`python3.11-nodejs22` | 3.11.15 | 22.22.3 | trixie
88+
`python3.11-nodejs22-bookworm` | 3.11.15 | 22.22.3 | bookworm
89+
`python3.11-nodejs22-slim` | 3.11.15 | 22.22.3 | slim
90+
`python3.11-nodejs22-alpine` | 3.11.15 | 22.22.3 | alpine
91+
`python3.10-nodejs26` | 3.10.20 | 26.1.0 | trixie
92+
`python3.10-nodejs26-bookworm` | 3.10.20 | 26.1.0 | bookworm
93+
`python3.10-nodejs26-slim` | 3.10.20 | 26.1.0 | slim
94+
`python3.10-nodejs26-alpine` | 3.10.20 | 26.1.0 | alpine
9195
`python3.10-nodejs25` | 3.10.20 | 25.9.0 | trixie
9296
`python3.10-nodejs25-bookworm` | 3.10.20 | 25.9.0 | bookworm
9397
`python3.10-nodejs25-slim` | 3.10.20 | 25.9.0 | slim
9498
`python3.10-nodejs25-alpine` | 3.10.20 | 25.9.0 | alpine
95-
`python3.10-nodejs24` | 3.10.20 | 24.14.1 | trixie
96-
`python3.10-nodejs24-bookworm` | 3.10.20 | 24.14.1 | bookworm
97-
`python3.10-nodejs24-slim` | 3.10.20 | 24.14.1 | slim
98-
`python3.10-nodejs24-alpine` | 3.10.20 | 24.14.1 | alpine
99-
`python3.10-nodejs22` | 3.10.20 | 22.22.2 | trixie
100-
`python3.10-nodejs22-bookworm` | 3.10.20 | 22.22.2 | bookworm
101-
`python3.10-nodejs22-slim` | 3.10.20 | 22.22.2 | slim
102-
`python3.10-nodejs22-alpine` | 3.10.20 | 22.22.2 | alpine
103-
`python3.10-nodejs20` | 3.10.20 | 20.20.2 | trixie
104-
`python3.10-nodejs20-bookworm` | 3.10.20 | 20.20.2 | bookworm
105-
`python3.10-nodejs20-slim` | 3.10.20 | 20.20.2 | slim
106-
`python3.10-nodejs20-alpine` | 3.10.20 | 20.20.2 | alpine
99+
`python3.10-nodejs24` | 3.10.20 | 24.15.0 | trixie
100+
`python3.10-nodejs24-bookworm` | 3.10.20 | 24.15.0 | bookworm
101+
`python3.10-nodejs24-slim` | 3.10.20 | 24.15.0 | slim
102+
`python3.10-nodejs24-alpine` | 3.10.20 | 24.15.0 | alpine
103+
`python3.10-nodejs22` | 3.10.20 | 22.22.3 | trixie
104+
`python3.10-nodejs22-bookworm` | 3.10.20 | 22.22.3 | bookworm
105+
`python3.10-nodejs22-slim` | 3.10.20 | 22.22.3 | slim
106+
`python3.10-nodejs22-alpine` | 3.10.20 | 22.22.3 | alpine
107107

108108
<!-- TAGS_END -->
109109

@@ -125,10 +125,10 @@ Python version | Start | End
125125

126126
Node.js version | Start | End
127127
--- | --- | ---
128+
v26 | 2026-05-05 | 2029-04-30
128129
v25 | 2025-10-15 | 2026-06-01
129130
v24 | 2025-05-06 | 2028-04-30
130131
v22 | 2024-04-24 | 2027-04-30
131-
v20 | 2023-04-18 | 2026-04-30
132132

133133
<!-- SUPPORTED_VERSIONS_END -->
134134

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ readme = "README.md"
1212
requires-python = "~=3.14.0"
1313

1414
[build-system]
15-
requires = ["uv_build>=0.10.2,<0.11.0"]
15+
requires = ["uv_build>=0.11.8,<0.12.0"]
1616
build-backend = "uv_build"
1717

1818
[project.scripts]

‎uv.lock‎

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)