Skip to content

Commit 42a8d78

Browse files
authored
Merge branch 'main' into g.proj_json
2 parents 232ab66 + 122fd23 commit 42a8d78

File tree

129 files changed

+7834
-8053
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+7834
-8053
lines changed

.github/workflows/additional_checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
with:
3939
python-version: "3.14"
4040
- name: Install uv and restore its cache
41-
uses: astral-sh/setup-uv@85856786d1ce8acfbcc2f13a5f3fbd6b938f9f41 # v7.1.2
41+
uses: astral-sh/setup-uv@5a7eac68fb9809dea845d802897dc5c723910fa3 # v7.1.3
4242
with:
4343
# To not have the last commit JSON and release notes files affected on
4444
# releases, if copying the contents displayed in the CI logs.

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
if: ${{ matrix.language == 'c-cpp' }}
6262

6363
- name: Initialize CodeQL
64-
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
64+
uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
6565
with:
6666
languages: ${{ matrix.language }}
6767
config-file: ./.github/codeql/codeql-config.yml
@@ -86,6 +86,6 @@ jobs:
8686
run: .github/workflows/build_ubuntu-24.04.sh "${HOME}/install"
8787

8888
- name: Perform CodeQL Analysis
89-
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
89+
uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
9090
with:
9191
category: "/language:${{matrix.language}}"

.github/workflows/python-code-quality.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ jobs:
3232
# renovate: datasource=pypi depName=flake8
3333
FLAKE8_VERSION: "7.3.0"
3434
# renovate: datasource=pypi depName=pylint
35-
PYLINT_VERSION: "4.0.2"
35+
PYLINT_VERSION: "4.0.3"
3636
# renovate: datasource=pypi depName=bandit
3737
BANDIT_VERSION: "1.8.6"
3838
# renovate: datasource=pypi depName=ruff
39-
RUFF_VERSION: "0.14.4"
39+
RUFF_VERSION: "0.14.5"
4040

4141
runs-on: ${{ matrix.os }}
4242
permissions:
@@ -133,7 +133,7 @@ jobs:
133133
path: bandit.sarif
134134

135135
- name: Upload SARIF File into Security Tab
136-
uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
136+
uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v4.31.3
137137
with:
138138
sarif_file: bandit.sarif
139139

.github/workflows/test-nix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
persist-credentials: false
3434

3535
- name: Install nix
36-
uses: DeterminateSystems/determinate-nix-action@0261e3554149588c911e068afc042bdc0627f227 # v3.12.2
36+
uses: DeterminateSystems/determinate-nix-action@9596b92e70cbf68a494a2b0273cb5b680184f5fc # v3.13.1
3737

3838
- name: Setup cachix
3939
uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ repos:
4949
- id: detect-private-key
5050
- repo: https://github.com/astral-sh/ruff-pre-commit
5151
# Ruff version.
52-
rev: v0.14.4
52+
rev: v0.14.5
5353
hooks:
5454
# Run the linter.
5555
- id: ruff-check

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# syntax=docker/dockerfile:1.19@sha256:b6afd42430b15f2d2a4c5a02b919e98a525b785b1aaff16747d2f623364e39b6
1+
# syntax=docker/dockerfile:1.20@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d
22

33
# Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
44
# Changes to this file must be copied over to the other file.
55
ARG GUI=without
66

7-
FROM ubuntu:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 AS common_start
7+
FROM ubuntu:24.04@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 AS common_start
88

99
ARG BASE_NAME="ubuntu:24.04"
1010
ARG PYTHON_VERSION=3.12

docker/ubuntu/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# syntax=docker/dockerfile:1.19@sha256:b6afd42430b15f2d2a4c5a02b919e98a525b785b1aaff16747d2f623364e39b6
1+
# syntax=docker/dockerfile:1.20@sha256:26147acbda4f14c5add9946e2fd2ed543fc402884fd75146bd342a7f6271dc1d
22

33
# Note: This file must be kept in sync in ./Dockerfile and ./docker/ubuntu/Dockerfile.
44
# Changes to this file must be copied over to the other file.
55
ARG GUI=without
66

7-
FROM ubuntu:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252 AS common_start
7+
FROM ubuntu:24.04@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54 AS common_start
88

99
ARG BASE_NAME="ubuntu:24.04"
1010
ARG PYTHON_VERSION=3.12

docker/ubuntu_wxgui/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:24.04@sha256:66460d557b25769b102175144d538d88219c077c678a49af4afca6fbfc1b5252
1+
FROM ubuntu:24.04@sha256:c35e29c9450151419d9448b0fd75374fec4fff364a27f176fb458d472dfc9e54
22

33
LABEL authors="Carmen Tawalika,Markus Neteler,Anika Weinmann,Tomas Zigo"
44

flake.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)