Skip to content

Commit e41b05f

Browse files
committed
Merge remote-tracking branch 'upstream/main'
# Conflicts: # .github/workflows/build.yaml # README.md # versions.json
2 parents 0f196b5 + 61b0d53 commit e41b05f

8 files changed

Lines changed: 151 additions & 146 deletions

File tree

.github/workflows/build.yaml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
3333
with:
3434
fetch-depth: 2
35-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
35+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
3636
with:
3737
enable-cache: true
3838
- name: Generate build matrix
@@ -58,7 +58,7 @@ jobs:
5858
steps:
5959
# Setup
6060
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
61-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
61+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6262
with:
6363
enable-cache: true
6464
- name: Generate Dockerfile from config
@@ -67,10 +67,15 @@ jobs:
6767
uv run dpn dockerfile --context "${context}"
6868
- name: Set up Docker Buildx
6969
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4
70+
- name: Login to Docker Hub
71+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
72+
with:
73+
username: ${{ secrets.DOCKERHUB_USERNAME }}
74+
password: ${{ secrets.DOCKERHUB_TOKEN }}
7075

7176
# Build
7277
- name: Build image
73-
uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7
78+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7
7479
with:
7580
context: .
7681
file: dockerfiles/${{ matrix.key }}.Dockerfile
@@ -88,7 +93,7 @@ jobs:
8893
8994
# Push
9095
- name: Login to Docker Hub
91-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
96+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
9297
with:
9398
username: ${{ secrets.DOCKERHUB_USERNAME }}
9499
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -116,7 +121,7 @@ jobs:
116121
fi
117122
118123
- name: Login to Docker Hub
119-
uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4
124+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # v4
120125
with:
121126
username: ${{ secrets.DOCKERHUB_USERNAME }}
122127
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -148,7 +153,7 @@ jobs:
148153
>> "builds/${{ matrix.key }}.json"
149154
150155
- name: Upload build context
151-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
156+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
152157
with:
153158
name: build-${{ matrix.key }}
154159
path: builds/*
@@ -161,7 +166,7 @@ jobs:
161166
needs: [deploy]
162167
steps:
163168
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
164-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7
169+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
165170
with:
166171
enable-cache: true
167172

.github/workflows/tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
12-
- uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
12+
- uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
1313
with:
1414
enable-cache: true
1515
- run: uv run ./bin/lint
1616
- run: uv run ./bin/test
1717
- name: Upload coverage reports to Codecov
18-
uses: codecov/codecov-action@1af58845a975a7985b0beb0cbe6fbbb71a41dbad # v5
18+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # v6
1919
env:
2020
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.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.7
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.0
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: 21 additions & 21 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-05-13
6+
Last updated by bot: 2026-05-14
77

88
The `latest` tag is currently:
99

@@ -36,10 +36,10 @@ Tag | Python version | Node.js version | Distro
3636
`python3.14-nodejs24-bookworm` | 3.14.5 | 24.15.0 | bookworm
3737
`python3.14-nodejs24-slim` | 3.14.5 | 24.15.0 | slim
3838
`python3.14-nodejs24-alpine` | 3.14.5 | 24.15.0 | alpine
39-
`python3.14-nodejs22` | 3.14.5 | 22.22.2 | trixie
40-
`python3.14-nodejs22-bookworm` | 3.14.5 | 22.22.2 | bookworm
41-
`python3.14-nodejs22-slim` | 3.14.5 | 22.22.2 | slim
42-
`python3.14-nodejs22-alpine` | 3.14.5 | 22.22.2 | 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
4343
`python3.13-nodejs26` | 3.13.13 | 26.1.0 | trixie
4444
`python3.13-nodejs26-bookworm` | 3.13.13 | 26.1.0 | bookworm
4545
`python3.13-nodejs26-slim` | 3.13.13 | 26.1.0 | slim
@@ -52,10 +52,10 @@ Tag | Python version | Node.js version | Distro
5252
`python3.13-nodejs24-bookworm` | 3.13.13 | 24.15.0 | bookworm
5353
`python3.13-nodejs24-slim` | 3.13.13 | 24.15.0 | slim
5454
`python3.13-nodejs24-alpine` | 3.13.13 | 24.15.0 | alpine
55-
`python3.13-nodejs22` | 3.13.13 | 22.22.2 | trixie
56-
`python3.13-nodejs22-bookworm` | 3.13.13 | 22.22.2 | bookworm
57-
`python3.13-nodejs22-slim` | 3.13.13 | 22.22.2 | slim
58-
`python3.13-nodejs22-alpine` | 3.13.13 | 22.22.2 | 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
5959
`python3.12-nodejs26` | 3.12.13 | 26.1.0 | trixie
6060
`python3.12-nodejs26-bookworm` | 3.12.13 | 26.1.0 | bookworm
6161
`python3.12-nodejs26-slim` | 3.12.13 | 26.1.0 | slim
@@ -68,10 +68,10 @@ Tag | Python version | Node.js version | Distro
6868
`python3.12-nodejs24-bookworm` | 3.12.13 | 24.15.0 | bookworm
6969
`python3.12-nodejs24-slim` | 3.12.13 | 24.15.0 | slim
7070
`python3.12-nodejs24-alpine` | 3.12.13 | 24.15.0 | alpine
71-
`python3.12-nodejs22` | 3.12.13 | 22.22.2 | trixie
72-
`python3.12-nodejs22-bookworm` | 3.12.13 | 22.22.2 | bookworm
73-
`python3.12-nodejs22-slim` | 3.12.13 | 22.22.2 | slim
74-
`python3.12-nodejs22-alpine` | 3.12.13 | 22.22.2 | 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
7575
`python3.11-nodejs26` | 3.11.15 | 26.1.0 | trixie
7676
`python3.11-nodejs26-bookworm` | 3.11.15 | 26.1.0 | bookworm
7777
`python3.11-nodejs26-slim` | 3.11.15 | 26.1.0 | slim
@@ -84,10 +84,10 @@ Tag | Python version | Node.js version | Distro
8484
`python3.11-nodejs24-bookworm` | 3.11.15 | 24.15.0 | bookworm
8585
`python3.11-nodejs24-slim` | 3.11.15 | 24.15.0 | slim
8686
`python3.11-nodejs24-alpine` | 3.11.15 | 24.15.0 | alpine
87-
`python3.11-nodejs22` | 3.11.15 | 22.22.2 | trixie
88-
`python3.11-nodejs22-bookworm` | 3.11.15 | 22.22.2 | bookworm
89-
`python3.11-nodejs22-slim` | 3.11.15 | 22.22.2 | slim
90-
`python3.11-nodejs22-alpine` | 3.11.15 | 22.22.2 | 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
9191
`python3.10-nodejs26` | 3.10.20 | 26.1.0 | trixie
9292
`python3.10-nodejs26-bookworm` | 3.10.20 | 26.1.0 | bookworm
9393
`python3.10-nodejs26-slim` | 3.10.20 | 26.1.0 | slim
@@ -100,10 +100,10 @@ Tag | Python version | Node.js version | Distro
100100
`python3.10-nodejs24-bookworm` | 3.10.20 | 24.15.0 | bookworm
101101
`python3.10-nodejs24-slim` | 3.10.20 | 24.15.0 | slim
102102
`python3.10-nodejs24-alpine` | 3.10.20 | 24.15.0 | alpine
103-
`python3.10-nodejs22` | 3.10.20 | 22.22.2 | trixie
104-
`python3.10-nodejs22-bookworm` | 3.10.20 | 22.22.2 | bookworm
105-
`python3.10-nodejs22-slim` | 3.10.20 | 22.22.2 | slim
106-
`python3.10-nodejs22-alpine` | 3.10.20 | 22.22.2 | 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

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: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)