Compare commits

..

9 Commits

Author SHA1 Message Date
Patrick Lehmann
1ac31243d2 v7.4.1 2026-01-21 08:24:24 +01:00
Patrick Lehmann
cbd7840707 Bumped documentation dependencies. 2026-01-21 08:17:44 +01:00
Patrick Lehmann
69f521d740 Fixed pyaml package name for MSYS2. 2026-01-21 08:13:19 +01:00
Patrick Lehmann
8274b22570 v7.4.0 2026-01-18 21:22:06 +01:00
Patrick Lehmann
c76fed150e Bumped dependencies. 2026-01-18 21:14:23 +01:00
Patrick Lehmann
d650bf7dcf Added Windows before scripts. 2026-01-18 21:13:41 +01:00
Patrick Lehmann
7b43b4aa58 v7.3.0 2026-01-18 01:24:45 +01:00
Patrick Lehmann
d0eae08e12 Removed tomli. 2026-01-18 00:39:02 +01:00
Patrick Lehmann
aefbd1cbba Bumped Python 3.12 to 3.13 in MSYS2. 2026-01-17 19:37:23 +01:00
18 changed files with 63 additions and 51 deletions

View File

@@ -136,17 +136,17 @@ jobs:
packages = {
"aiohttp": "python-aiohttp:p",
"coverage": "python-coverage:p",
"docstr_coverage": "python-pyyaml:p python-types-pyyaml:p",
"docstr_coverage": "python-pyaml:p python-types-pyyaml:p",
"igraph": "igraph:p",
"jinja2": "python-markupsafe:p",
"lxml": "python-lxml:p",
"numpy": "python-numpy:p",
"markupsafe": "python-markupsafe:p",
"pip": "python-pip:p",
"pyyaml": "python-pyyaml:p python-types-pyyaml:p",
"pyyaml": "python-pyaml: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

@@ -69,13 +69,23 @@ on:
required: false
default: ''
type: string
windows_before_script:
description: 'Scripts to execute before pytest on Windows (x64-64).'
required: false
default: ''
type: string
windows_arm_before_script:
description: 'Scripts to execute before pytest on Windows (aarch64).'
required: false
default: ''
type: string
mingw64_before_script:
description: 'Scripts to execute before pytest on Windows within MSYS2 MinGW64.'
description: 'Scripts to execute before pytest on Windows (x64-64) within MSYS2 MinGW64.'
required: false
default: ''
type: string
ucrt64_before_script:
description: 'Scripts to execute before pytest on Windows within MSYS2 UCRT64.'
description: 'Scripts to execute before pytest on Windows (x64-64) within MSYS2 UCRT64.'
required: false
default: ''
type: string
@@ -199,11 +209,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
@@ -282,11 +292,11 @@ jobs:
"numpy": "python-numpy:p",
"markupsafe": "python-markupsafe:p",
"pip": "python-pip:p",
"pyyaml": "python-pyyaml:p python-types-pyyaml:p",
"pyyaml": "python-pyaml:p python-types-pyyaml:p",
"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 +361,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)
@@ -380,13 +390,19 @@ jobs:
if: ( matrix.system == 'ubuntu' || matrix.system == 'ubuntu-arm' ) && inputs.ubuntu_before_script != ''
run: ${{ inputs.ubuntu_before_script }}
# TODO: Windows before script
- name: 🪟 Windows (x86-64) before scripts
if: matrix.system == 'windows' && inputs.windows_before_script != ''
run: ${{ inputs.windows_before_script }}
- name: 🪟🟦 MinGW64 before scripts
- name: 🏢 Windows (aarch64) before scripts
if: matrix.system == 'windows-arm' && inputs.windows_arm_before_script != ''
run: ${{ inputs.windows_arm_before_script }}
- name: 🪟🟦 Windows (x86-64) + MinGW64 before scripts
if: matrix.system == 'msys2' && matrix.runtime == 'MINGW64' && inputs.mingw64_before_script != ''
run: ${{ inputs.mingw64_before_script }}
- name: 🪟🟨 UCRT64 before scripts
- name: 🪟🟨 Windows (x86-64) + UCRT64 before scripts
if: matrix.system == 'msys2' && matrix.runtime == 'UCRT64' && inputs.ucrt64_before_script != ''
run: ${{ inputs.ucrt64_before_script }}

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

View File

@@ -124,7 +124,6 @@ It can be used for simple Python packages as well as namespace packages.
* :gh:`actions/setup-python`
* :pypi:`wheel`
* :pypi:`tomli`
* :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
* :pypi:`wheel`
* :pypi:`tomli`
* Python packages specified via :ref:`JOBTMPL/UnitTesting/Input/requirements` or
: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
* :pypi:`coverage`
* :pypi:`tomli`
* :gh:`pyTooling/upload-artifact`

View File

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

View File

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

View File

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

View File

@@ -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.11"]
build-backend = "setuptools.build_meta"
[tool.mypy]

View File

@@ -1,19 +1,19 @@
-r ../requirements.txt
pyTooling ~= 8.8
pyTooling ~= 8.11
# Enforce latest version on ReadTheDocs
sphinx ~= 8.2
docutils ~= 0.21.0
sphinx ~= 9.1
docutils ~= 0.22.0
docutils_stubs ~= 0.0.22
# ReadTheDocs Theme
sphinx_rtd_theme ~= 3.0
# Sphinx Extenstions
sphinxcontrib-mermaid ~= 1.2
sphinxcontrib-mermaid ~= 2.0
autoapi >= 2.0.1
sphinx_design ~= 0.6.0
sphinx_design ~= 0.7.0
sphinx-copybutton >= 0.5.0
sphinx_autodoc_typehints ~= 3.5 # 3.6 is conflicting with old sphinx_design and rtd theme due to sphinx<9 and docutils<0.22
sphinx_reports ~= 0.9.0
sphinx_reports ~= 0.10.0

View File

@@ -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.4.1"
__keywords__ = ["GitHub Actions"]
__issue_tracker__ = "https://GitHub.com/pyTooling/Actions/issues"

View File

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

View File

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

View File

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