This commit is contained in:
Patrick Lehmann
2026-01-18 01:24:45 +01:00
committed by GitHub
18 changed files with 34 additions and 38 deletions

View File

@@ -146,7 +146,7 @@ jobs:
"pyyaml": "python-pyyaml:p python-types-pyyaml:p",
"ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p",
"tomli": "python-tomli:p", # outdated, now part of Python as tomllib
"wheel": "python-wheel:p",
"pyEDAA.ProjectModel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
"pyEDAA.Reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",

View File

@@ -89,9 +89,9 @@ jobs:
with:
python-version: ${{ inputs.python_version }}
- name: 🔧 Install wheel,tomli and pip dependencies (native)
- name: 🔧 Install wheel and pip dependencies (native)
run: |
python -m pip install --disable-pip-version-check -U wheel tomli
python -m pip install --disable-pip-version-check -U wheel
- name: 🔁 Extract configurations from pyproject.toml
id: getVariables
@@ -105,7 +105,7 @@ jobs:
print(f"Python: {version} (of default installation)")
from tomli import load as tomli_load
from tomllib import load as toml_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 = toml_load(file)
toolSection = pyProjectSettings["tool"]
if "pytest" in toolSection:
@@ -163,7 +163,7 @@ jobs:
coverageRCFile = Path(coverageRC)
if coverageRCFile.exists():
with coverageRCFile.open("rb") as file:
coverageRCSettings = tomli_load(file)
coverageRCSettings = toml_load(file)
coverageHTMLDirectory = Path(coverageRCSettings["html"]["directory"])
coverageXMLFile = Path(coverageRCSettings["xml"]["output"])

View File

@@ -70,7 +70,6 @@ jobs:
python-markupsafe:p
python-pyaml:p python-types-pyyaml:p
python-ruamel-yaml:p python-ruamel.yaml.clib:p
python-tomli:p
- name: 🐍 Setup Python ${{ matrix.python }}
uses: actions/setup-python@v6

View File

@@ -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.")

View File

@@ -124,9 +124,9 @@ jobs:
run: |
tree -pash artifacts
- name: 🔧 Install coverage and tomli
- name: 🔧 Install coverage
run: |
python -m pip install -U --disable-pip-version-check --break-system-packages coverage[toml] tomli
python -m pip install -U --disable-pip-version-check --break-system-packages coverage[toml]
- name: Rename .coverage files and move them all into 'coverage/'
run: |

View File

@@ -99,7 +99,7 @@ jobs:
with:
python-version: ${{ inputs.python_version }}
- name: 🔧 Install wheel,tomli and pip dependencies (native)
- name: 🔧 Install wheel and pip dependencies (native)
run: |
python -m pip install --disable-pip-version-check -U wheel
python -m pip install --disable-pip-version-check ${{ inputs.requirements }}
@@ -158,7 +158,7 @@ jobs:
with:
python-version: ${{ inputs.python_version }}
- name: 🔧 Install wheel,tomli and pip dependencies (native)
- name: 🔧 Install wheel and pip dependencies (native)
run: |
python -m pip install --disable-pip-version-check -U wheel
python -m pip install --disable-pip-version-check ${{ inputs.requirements }}

View File

@@ -199,11 +199,11 @@ jobs:
# Compute Dependencies for MSYS2 steps
- name: 🔧 Install dependencies (system Python for Python shell)
if: matrix.system == 'msys2'
shell: pwsh
run: |
py -3.9 -m pip install --disable-pip-version-check --break-system-packages -U tomli
# - name: 🔧 Install dependencies (system Python for Python shell)
# if: matrix.system == 'msys2'
# shell: pwsh
# run: |
# py -3.12 -m pip install --disable-pip-version-check --break-system-packages -U tomli
- name: Compute path to requirements file
id: requirements
@@ -286,7 +286,7 @@ jobs:
"ruamel.yaml": "python-ruamel-yaml:p",
# "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p",
"tomli": "python-tomli:p", # outdated, now part of Python as tomllib
"wheel": "python-wheel:p",
"pyedaa.projectmodel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
"pyedaa.reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
@@ -351,10 +351,10 @@ jobs:
# Python Dependency steps
- name: 🔧 Install wheel,tomli and pip dependencies (native)
- name: 🔧 Install wheel and pip dependencies (native)
if: matrix.system != 'msys2'
run: |
python -m pip install --disable-pip-version-check -U wheel tomli
python -m pip install --disable-pip-version-check -U wheel
python -m pip install --disable-pip-version-check ${{ steps.requirements.outputs.requirements }}
- name: 🔧 Install pip dependencies (MSYS2)

View File

@@ -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 }}