Updating r7 from v7.3.0

This commit is contained in:
Patrick Lehmann
2026-01-18 01:34:03 +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", "pyyaml": "python-pyyaml:p python-types-pyyaml:p",
"ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p", "sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p", "tomli": "python-tomli:p", # outdated, now part of Python as tomllib
"wheel": "python-wheel:p", "wheel": "python-wheel:p",
"pyEDAA.ProjectModel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml: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", "pyEDAA.Reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",

View File

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

View File

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

View File

@@ -287,9 +287,9 @@ jobs:
exclude_list = "${{ inputs.exclude_list }}".strip() exclude_list = "${{ inputs.exclude_list }}".strip()
disable_list = "${{ inputs.disable_list }}".strip() disable_list = "${{ inputs.disable_list }}".strip()
currentMSYS2Version = "3.12" currentMSYS2Version = "3.13"
currentAlphaVersion = "3.15" currentAlphaVersion = "3.15"
currentAlphaRelease = "3.15.0-a.1" currentAlphaRelease = "3.15.0-a.4"
if systems == "": if systems == "":
print("::error title=Parameters::system_list is empty.") print("::error title=Parameters::system_list is empty.")

View File

@@ -124,9 +124,9 @@ jobs:
run: | run: |
tree -pash artifacts tree -pash artifacts
- name: 🔧 Install coverage and tomli - name: 🔧 Install coverage
run: | 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/' - name: Rename .coverage files and move them all into 'coverage/'
run: | run: |

View File

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

View File

@@ -199,11 +199,11 @@ jobs:
# Compute Dependencies for MSYS2 steps # Compute Dependencies for MSYS2 steps
- name: 🔧 Install dependencies (system Python for Python shell) # - name: 🔧 Install dependencies (system Python for Python shell)
if: matrix.system == 'msys2' # if: matrix.system == 'msys2'
shell: pwsh # shell: pwsh
run: | # run: |
py -3.9 -m pip install --disable-pip-version-check --break-system-packages -U tomli # py -3.12 -m pip install --disable-pip-version-check --break-system-packages -U tomli
- name: Compute path to requirements file - name: Compute path to requirements file
id: requirements id: requirements
@@ -286,7 +286,7 @@ jobs:
"ruamel.yaml": "python-ruamel-yaml:p", "ruamel.yaml": "python-ruamel-yaml:p",
# "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p", # "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p", "sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p", "tomli": "python-tomli:p", # outdated, now part of Python as tomllib
"wheel": "python-wheel:p", "wheel": "python-wheel:p",
"pyedaa.projectmodel": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml: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", "pyedaa.reports": "python-ruamel-yaml:p python-ruamel.yaml.clib:p python-lxml:p",
@@ -351,10 +351,10 @@ jobs:
# Python Dependency steps # Python Dependency steps
- name: 🔧 Install wheel,tomli and pip dependencies (native) - name: 🔧 Install wheel and pip dependencies (native)
if: matrix.system != 'msys2' if: matrix.system != 'msys2'
run: | 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 }} python -m pip install --disable-pip-version-check ${{ steps.requirements.outputs.requirements }}
- name: 🔧 Install pip dependencies (MSYS2) - 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-python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]' expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]'
expected-exclude-jobs: '["windows-arm:3.10"]' 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-default-version: ${{ needs.Params_Default.outputs.python_version }}
generated-jobmatrix: ${{ needs.Params_Default.outputs.python_jobs }} 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-python-versions: '["3.12", "3.13", "pypy-3.10", "pypy-3.11"]'
expected-systems: '["ubuntu", "ubuntu-arm", "windows", "windows-arm", "macos", "macos-arm"]' 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-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-default-version: ${{ needs.Params_PythonVersions.outputs.python_version }}
generated-jobmatrix: ${{ needs.Params_PythonVersions.outputs.python_jobs }} 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-python-versions: '["3.10", "3.11", "3.12", "3.13", "3.14"]'
expected-systems: '["windows"]' expected-systems: '["windows"]'
expected-exclude-jobs: '[]' 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-default-version: ${{ needs.Params_Systems.outputs.python_version }}
generated-jobmatrix: ${{ needs.Params_Systems.outputs.python_jobs }} generated-jobmatrix: ${{ needs.Params_Systems.outputs.python_jobs }}

View File

@@ -124,7 +124,6 @@ It can be used for simple Python packages as well as namespace packages.
* :gh:`actions/setup-python` * :gh:`actions/setup-python`
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
* :ref:`pyTooling/Actions/.github/workflows/UnitTesting.yml <JOBTMPL/UnitTesting>` * :ref:`pyTooling/Actions/.github/workflows/UnitTesting.yml <JOBTMPL/UnitTesting>`
@@ -145,7 +144,6 @@ It can be used for simple Python packages as well as namespace packages.
* pip * pip
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
* Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or * Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or
:ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter. :ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter.
@@ -203,7 +201,6 @@ It can be used for simple Python packages as well as namespace packages.
* pip * pip
* :pypi:`coverage` * :pypi:`coverage`
* :pypi:`tomli`
* :gh:`pyTooling/upload-artifact` * :gh:`pyTooling/upload-artifact`

View File

@@ -56,7 +56,6 @@ cloud services like :term:`CodeCov` or :term:`Codacy`.
* pip * pip
* :pypi:`coverage` * :pypi:`coverage`
* :pypi:`tomli`
* :gh:`pyTooling/upload-artifact` * :gh:`pyTooling/upload-artifact`

View File

@@ -49,7 +49,6 @@ duplications within jobs.
* :gh:`actions/setup-python` * :gh:`actions/setup-python`
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
.. _JOBTMPL/ExtractConfiguration/Instantiation: .. _JOBTMPL/ExtractConfiguration/Instantiation:

View File

@@ -60,7 +60,6 @@ Configuration options to :term:`pytest` should be given via section ``[tool.pyte
* pip * pip
* :pypi:`wheel` * :pypi:`wheel`
* :pypi:`tomli`
* Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or * Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or
:ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter. :ref:`JOBTMPL/UnitTesting/Input/mingw_requirements` parameter.

View File

@@ -164,7 +164,7 @@ Example Pipelines
.. code-block:: toml .. code-block:: toml
[build-system] [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" build-backend = "setuptools.build_meta"
[tool.mypy] [tool.mypy]

View File

@@ -1,6 +1,6 @@
-r ../requirements.txt -r ../requirements.txt
pyTooling ~= 8.8 pyTooling ~= 8.10
# Enforce latest version on ReadTheDocs # Enforce latest version on ReadTheDocs
sphinx ~= 8.2 sphinx ~= 8.2

View File

@@ -36,7 +36,7 @@ __author__ = "Patrick Lehmann"
__email__ = "Paebbels@gmail.com" __email__ = "Paebbels@gmail.com"
__copyright__ = "2017-2026, Patrick Lehmann" __copyright__ = "2017-2026, Patrick Lehmann"
__license__ = "Apache License, Version 2.0" __license__ = "Apache License, Version 2.0"
__version__ = "7.2.1" __version__ = "7.3.0"
__keywords__ = ["GitHub Actions"] __keywords__ = ["GitHub Actions"]
__issue_tracker__ = "https://GitHub.com/pyTooling/Actions/issues" __issue_tracker__ = "https://GitHub.com/pyTooling/Actions/issues"

View File

@@ -1,8 +1,8 @@
[build-system] [build-system]
requires = [ requires = [
"setuptools >= 80.0", "setuptools >= 80.0",
"wheel ~= 0.45", "wheel ~= 0.45.0",
"pyTooling ~= 8.8" "pyTooling ~= 8.10"
] ]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"

View File

@@ -1 +1 @@
pyTooling ~= 8.8 pyTooling ~= 8.10

View File

@@ -116,7 +116,9 @@ $jobs = @()
if ($livedoc) if ($livedoc)
{ Write-Host -ForegroundColor DarkYellow "[live][DOC] Building documentation using Sphinx ..." { 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" Write-Host -ForegroundColor DarkYellow "[live][DOC] Documentation finished"
} }
@@ -126,7 +128,8 @@ elseif ($doc)
# Compile documentation # Compile documentation
$compileDocFunc = { $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 $docJob = Start-Job -Name "Documentation" -ScriptBlock $compileDocFunc
# $jobs += $docJob # $jobs += $docJob