From e277b4e5f4b432bba06a85b9a4cf1d5d611299c6 Mon Sep 17 00:00:00 2001 From: firewave Date: Fri, 10 Oct 2025 15:06:18 +0200 Subject: [PATCH 1/3] fixed #14184 - added/updated to Python 3.14 in CI --- .github/workflows/CI-windows.yml | 4 ++-- .github/workflows/asan.yml | 4 ++-- .github/workflows/scriptcheck.yml | 4 ++-- .github/workflows/tsan.yml | 4 ++-- .github/workflows/ubsan.yml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index bdd6ff57e0d..d5d4b5e4992 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -91,11 +91,11 @@ jobs: with: persist-credentials: false - - name: Set up Python 3.13 + - name: Set up Python if: matrix.config == 'release' uses: actions/setup-python@v5 with: - python-version: '3.13' + python-version: '3.14' check-latest: true - name: Set up Visual Studio environment diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml index 5e3a71914b7..cbca3cacabc 100644 --- a/.github/workflows/asan.yml +++ b/.github/workflows/asan.yml @@ -36,10 +36,10 @@ jobs: with: key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }} - - name: Set up Python 3.13 + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.13' + python-version: '3.14' check-latest: true - name: Install missing software on ubuntu diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml index 729879cc96c..66e54ddff98 100644 --- a/.github/workflows/scriptcheck.yml +++ b/.github/workflows/scriptcheck.yml @@ -48,9 +48,9 @@ jobs: runs-on: ubuntu-22.04 strategy: matrix: - python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13'] + python-version: [3.7, 3.8, 3.9, '3.10', '3.11', '3.12', '3.13', '3.14'] include: - - python-version: '3.13' + - python-version: '3.14' python-latest: true fail-fast: false diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml index 378fbfc41a1..6742f8fa957 100644 --- a/.github/workflows/tsan.yml +++ b/.github/workflows/tsan.yml @@ -36,10 +36,10 @@ jobs: with: key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }} - - name: Set up Python 3.13 + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.13' + python-version: '3.14' check-latest: true - name: Install missing software on ubuntu diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml index 9b2fa163193..7a7755d091a 100644 --- a/.github/workflows/ubsan.yml +++ b/.github/workflows/ubsan.yml @@ -36,10 +36,10 @@ jobs: with: key: ${{ github.workflow }}-${{ github.job }}-${{ matrix.os }} - - name: Set up Python 3.13 + - name: Set up Python uses: actions/setup-python@v5 with: - python-version: '3.13' + python-version: '3.14' check-latest: true - name: Install missing software on ubuntu From 311c86cefa04b387d243c67bbf97403797902d45 Mon Sep 17 00:00:00 2001 From: firewave Date: Sat, 11 Oct 2025 16:07:38 +0200 Subject: [PATCH 2/3] misra.py: replaced deprecated `codecs.open()` with `open()` ``` DeprecationWarning: codecs.open() is deprecated. Use open() instead. ``` --- addons/misra.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/misra.py b/addons/misra.py index ca8eb2bfb69..cea5596d47d 100755 --- a/addons/misra.py +++ b/addons/misra.py @@ -22,7 +22,6 @@ import re import os import argparse -import codecs import string import copy @@ -4525,7 +4524,7 @@ def loadRuleTexts(self, filename): encodings = ['ascii', 'utf-8', 'windows-1250', 'windows-1252'] for e in encodings: try: - file_stream = codecs.open(filename, 'r', encoding=e) + file_stream = open(filename, 'r', encoding=e) file_stream.readlines() file_stream.seek(0) except UnicodeDecodeError: From eaa02d02d20205cd233dbb10cc64f0a55a2276e6 Mon Sep 17 00:00:00 2001 From: firewave Date: Sat, 11 Oct 2025 16:09:02 +0200 Subject: [PATCH 3/3] release-set-version.py: fixed invalid escape sequence ``` SyntaxWarning: "\." is an invalid escape sequence. Such sequences will not work in the future. Did you mean "\\."? A raw string is also an option. ``` --- tools/release-set-version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/release-set-version.py b/tools/release-set-version.py index 42462545698..f5052cc9035 100644 --- a/tools/release-set-version.py +++ b/tools/release-set-version.py @@ -81,7 +81,7 @@ def check_sed(args): check_sed(['-i', '-r', f's/<[?]define ProductName[ ]*=.*//', 'win_installer/productInfo.wxi']) check_sed(['-i', '-r', f's/<[?]define ProductVersion[ ]*=.*//', 'win_installer/productInfo.wxi']) for g in glob.glob('man/*.md'): - check_sed(['-i', '-r', f's/subtitle: Version 2\.[0-9].*/subtitle: Version {cppcheck_version_string}/', g]) + check_sed(['-i', '-r', f's/subtitle: Version 2\\.[0-9].*/subtitle: Version {cppcheck_version_string}/', g]) print('Versions have been changed.') print('') print('Please double check these results below:')