From aefbd1cbbaa9cc8dd29bad21814ce5a25f42f70f Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Sat, 17 Jan 2026 19:37:23 +0100 Subject: [PATCH] Bumped Python 3.12 to 3.13 in MSYS2. --- .github/workflows/ExtractConfiguration.yml | 4 ++-- .github/workflows/Parameters.yml | 4 ++-- .github/workflows/_Checking_Parameters.yml | 6 +++--- doc/index.rst | 2 +- doc/requirements.txt | 2 +- myPackage/__init__.py | 2 +- pyproject.toml | 4 ++-- requirements.txt | 2 +- run.ps1 | 7 +++++-- 9 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ExtractConfiguration.yml b/.github/workflows/ExtractConfiguration.yml index 9c80b92..7247364 100644 --- a/.github/workflows/ExtractConfiguration.yml +++ b/.github/workflows/ExtractConfiguration.yml @@ -105,7 +105,7 @@ jobs: print(f"Python: {version} (of default installation)") - from tomli import load as tomli_load + from tomllib import load as tomllib_load unittestXMLFile = Path("./unittest.xml") coverageHTMLDirectory = Path("htmlcov") @@ -121,7 +121,7 @@ jobs: pyProjectFile = Path("pyproject.toml") if pyProjectFile.exists(): with pyProjectFile.open("rb") as file: - pyProjectSettings = tomli_load(file) + pyProjectSettings = tomllib_load(file) toolSection = pyProjectSettings["tool"] if "pytest" in toolSection: diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index 55b13d8..95e21e6 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -287,9 +287,9 @@ jobs: exclude_list = "${{ inputs.exclude_list }}".strip() disable_list = "${{ inputs.disable_list }}".strip() - currentMSYS2Version = "3.12" + currentMSYS2Version = "3.13" currentAlphaVersion = "3.15" - currentAlphaRelease = "3.15.0-a.1" + currentAlphaRelease = "3.15.0-a.4" if systems == "": print("::error title=Parameters::system_list is empty.") diff --git a/.github/workflows/_Checking_Parameters.yml b/.github/workflows/_Checking_Parameters.yml index f230ee9..4cf61f0 100644 --- a/.github/workflows/_Checking_Parameters.yml +++ b/.github/workflows/_Checking_Parameters.yml @@ -73,7 +73,7 @@ jobs: expected-python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]' expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]' expected-exclude-jobs: '["windows-arm:3.10"]' - expected-include-jobs: '["mingw64:3.12", "ucrt64:3.12"]' + expected-include-jobs: '["mingw64:3.13", "ucrt64:3.13"]' generated-default-version: ${{ needs.Params_Default.outputs.python_version }} generated-jobmatrix: ${{ needs.Params_Default.outputs.python_jobs }} @@ -101,7 +101,7 @@ jobs: expected-python-versions: '["3.12", "3.13", "pypy-3.10", "pypy-3.11"]' expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]' expected-exclude-jobs: '["windows-arm:pypy-3.10", "windows-arm:pypy-3.11"]' - expected-include-jobs: '["mingw64:3.12", "ucrt64:3.12"]' + expected-include-jobs: '["mingw64:3.13", "ucrt64:3.13"]' generated-default-version: ${{ needs.Params_PythonVersions.outputs.python_version }} generated-jobmatrix: ${{ needs.Params_PythonVersions.outputs.python_jobs }} @@ -123,7 +123,7 @@ jobs: expected-python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]' expected-systems: '["windows"]' expected-exclude-jobs: '[]' - expected-include-jobs: '["mingw32:3.12", "mingw64:3.12"]' + expected-include-jobs: '["mingw32:3.13", "mingw64:3.13"]' generated-default-version: ${{ needs.Params_Systems.outputs.python_version }} generated-jobmatrix: ${{ needs.Params_Systems.outputs.python_jobs }} diff --git a/doc/index.rst b/doc/index.rst index cd7ed20..a0aa775 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -164,7 +164,7 @@ Example Pipelines .. code-block:: toml [build-system] - requires = ["setuptools >= 80.0", "wheel ~= 0.45", "pyTooling ~= 8.8"] + requires = ["setuptools >= 80.0", "wheel ~= 0.45.0", "pyTooling ~= 8.10"] build-backend = "setuptools.build_meta" [tool.mypy] diff --git a/doc/requirements.txt b/doc/requirements.txt index 40350e2..0103dc5 100644 --- a/doc/requirements.txt +++ b/doc/requirements.txt @@ -1,6 +1,6 @@ -r ../requirements.txt -pyTooling ~= 8.8 +pyTooling ~= 8.10 # Enforce latest version on ReadTheDocs sphinx ~= 8.2 diff --git a/myPackage/__init__.py b/myPackage/__init__.py index 0231313..af0462e 100644 --- a/myPackage/__init__.py +++ b/myPackage/__init__.py @@ -36,7 +36,7 @@ __author__ = "Patrick Lehmann" __email__ = "Paebbels@gmail.com" __copyright__ = "2017-2026, Patrick Lehmann" __license__ = "Apache License, Version 2.0" -__version__ = "7.2.1" +__version__ = "7.3.0" __keywords__ = ["GitHub Actions"] __issue_tracker__ = "https://GitHub.com/pyTooling/Actions/issues" diff --git a/pyproject.toml b/pyproject.toml index 11c4f18..e51adc2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,8 +1,8 @@ [build-system] requires = [ "setuptools >= 80.0", - "wheel ~= 0.45", - "pyTooling ~= 8.8" + "wheel ~= 0.45.0", + "pyTooling ~= 8.10" ] build-backend = "setuptools.build_meta" diff --git a/requirements.txt b/requirements.txt index a5238b4..df06e4b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pyTooling ~= 8.8 +pyTooling ~= 8.10 diff --git a/run.ps1 b/run.ps1 index f55babc..9ac737d 100644 --- a/run.ps1 +++ b/run.ps1 @@ -116,7 +116,9 @@ $jobs = @() if ($livedoc) { Write-Host -ForegroundColor DarkYellow "[live][DOC] Building documentation using Sphinx ..." - .\doc\make.bat html --verbose + cd doc + py -3.14 -m sphinx.cmd.build -b html . _build/html --doctree-dir _build/doctrees --jobs auto --warning-file _build/sphinx-warnings.log --verbose + cd .. Write-Host -ForegroundColor DarkYellow "[live][DOC] Documentation finished" } @@ -126,7 +128,8 @@ elseif ($doc) # Compile documentation $compileDocFunc = { - .\doc\make.bat html --verbose + cd doc + py -3.14 -m sphinx.cmd.build -b html . _build/html --doctree-dir _build/doctrees --jobs auto --warning-file _build/sphinx-warnings.log --verbose } $docJob = Start-Job -Name "Documentation" -ScriptBlock $compileDocFunc # $jobs += $docJob