Compare commits

..

11 Commits
v7.4.0 ... main

Author SHA1 Message Date
Patrick Lehmann
9ee7bcc27a v7.4.4 2026-02-24 00:09:59 +01:00
Patrick Lehmann
796bfa716e Fix application testing (introduced for UnitTesting in v7.0.0). 2026-02-24 00:08:47 +01:00
Patrick Lehmann
68116f4d7d v7.4.3 2026-02-23 23:06:43 +01:00
Patrick Lehmann
d63a910e7d Bumped dependencies. 2026-02-23 11:55:48 +01:00
Patrick Lehmann
de6ebc29fc LaTeX: Using alternative for addnab/docker-run-action. 2026-02-16 16:14:47 +01:00
Patrick Lehmann
1eed538a2d Fixed variable use in ApplicationTesting. 2026-02-06 08:43:55 +01:00
Patrick Lehmann
370c306306 v7.4.2 2026-01-21 23:38:28 +01:00
Patrick Lehmann
c0f5c9f6e1 Fix application testing and how requirements.txt files are searched (introduced for UnitTesting in v7.0.0). 2026-01-21 23:31:09 +01:00
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
8 changed files with 80 additions and 33 deletions

View File

@@ -37,7 +37,7 @@ on:
requirements: requirements:
description: 'Python dependencies to be installed through pip.' description: 'Python dependencies to be installed through pip.'
required: false required: false
default: '-r tests/requirements.txt' default: '-r ./requirements.txt'
type: string type: string
pacboy: pacboy:
description: 'MSYS2 dependencies to be installed through pacboy (pacman).' description: 'MSYS2 dependencies to be installed through pacboy (pacman).'
@@ -94,6 +94,39 @@ jobs:
name: ${{ inputs.wheel }} name: ${{ inputs.wheel }}
path: install path: install
# TODO: extract step to an Action so package, so code can be shared with UnitTesting.yml
- name: Compute path to requirements file
id: requirements
shell: python
run: |
from os import getenv
from pathlib import Path
from sys import version
print(f"Python: {version}")
requirements = "${{ inputs.requirements }}"
if requirements.startswith("-r"):
requirements = requirements[2:].lstrip()
if requirements.startswith("./"):
requirementsFile = Path("${{ inputs.root_directory || '.' }}") / Path("${{ inputs.tests_directory || '.' }}") / Path("${{ inputs.apptest_directory || '.' }}") / Path(requirements[2:])
else:
requirementsFile = Path(requirements)
if not requirementsFile.exists():
print(f"::error title=FileNotFoundError::{requirementsFile}")
exit(1)
print(f"requirements file: {requirementsFile.as_posix()}")
# Write requirements path to special file
github_output = Path(getenv("GITHUB_OUTPUT"))
print(f"GITHUB_OUTPUT: {github_output}")
with github_output.open("a+") as f:
f.write(f"requirements=-r {requirementsFile.as_posix()}\n")
else:
print(f"requirements list: {requirements}")
# TODO: extract step to an Action so package lists are shared with UnitTesting (and GHDL?) # TODO: extract step to an Action so package lists are shared with UnitTesting (and GHDL?)
- name: Compute pacman/pacboy packages - name: Compute pacman/pacboy packages
id: pacboy id: pacboy
@@ -122,7 +155,7 @@ jobs:
return requirements return requirements
requirements = "${{ inputs.requirements }}" requirements = "${{ steps.requirements.outputs.requirements }}"
if requirements.startswith("-r"): if requirements.startswith("-r"):
requirementsFile = Path(requirements[2:].lstrip()) requirementsFile = Path(requirements[2:].lstrip())
try: try:
@@ -136,14 +169,14 @@ jobs:
packages = { packages = {
"aiohttp": "python-aiohttp:p", "aiohttp": "python-aiohttp:p",
"coverage": "python-coverage: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", "igraph": "igraph:p",
"jinja2": "python-markupsafe:p", "jinja2": "python-markupsafe:p",
"lxml": "python-lxml:p", "lxml": "python-lxml:p",
"numpy": "python-numpy:p", "numpy": "python-numpy:p",
"markupsafe": "python-markupsafe:p", "markupsafe": "python-markupsafe:p",
"pip": "python-pip: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", "ruamel.yaml": "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
"sphinx": "python-markupsafe:p", "sphinx": "python-markupsafe:p",
"tomli": "python-tomli:p", # outdated, now part of Python as tomllib "tomli": "python-tomli:p", # outdated, now part of Python as tomllib
@@ -191,6 +224,8 @@ jobs:
with github_output.open("a+") as f: with github_output.open("a+") as f:
f.write(f"pacboy_packages={' '.join(pacboyPackages)}\n") f.write(f"pacboy_packages={' '.join(pacboyPackages)}\n")
# Python setup
- name: '🟦 Setup MSYS2 for ${{ matrix.runtime }}' - name: '🟦 Setup MSYS2 for ${{ matrix.runtime }}'
uses: msys2/setup-msys2@v2 uses: msys2/setup-msys2@v2
if: matrix.system == 'msys2' if: matrix.system == 'msys2'
@@ -207,11 +242,13 @@ jobs:
with: with:
python-version: ${{ matrix.python }} python-version: ${{ matrix.python }}
# Python Dependency steps
- name: 🔧 Install wheel 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 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 ${{ steps.requirements.outputs.requirements }}
- name: 🔧 Install pip dependencies (MSYS2) - name: 🔧 Install pip dependencies (MSYS2)
if: matrix.system == 'msys2' if: matrix.system == 'msys2'
@@ -219,9 +256,11 @@ jobs:
if [ -n '${{ inputs.mingw_requirements }}' ]; then if [ -n '${{ inputs.mingw_requirements }}' ]; then
python -m pip install --disable-pip-version-check --break-system-packages ${{ inputs.mingw_requirements }} python -m pip install --disable-pip-version-check --break-system-packages ${{ inputs.mingw_requirements }}
else else
python -m pip install --disable-pip-version-check --break-system-packages ${{ inputs.requirements }} python -m pip install --disable-pip-version-check --break-system-packages ${{ steps.requirements.outputs.requirements }}
fi fi
# TODO: Before scripts?
- name: 🔧 Install wheel from artifact (Ubuntu/macOS) - name: 🔧 Install wheel from artifact (Ubuntu/macOS)
if: ( matrix.system != 'windows' && matrix.system != 'windows-arm' ) if: ( matrix.system != 'windows' && matrix.system != 'windows-arm' )
run: | run: |
@@ -232,6 +271,8 @@ jobs:
run: | run: |
python -m pip install -v --disable-pip-version-check (Get-Item .\install\*.whl).FullName python -m pip install -v --disable-pip-version-check (Get-Item .\install\*.whl).FullName
# Run pytests
- name: ✅ Run application tests (Ubuntu/macOS) - name: ✅ Run application tests (Ubuntu/macOS)
if: ( matrix.system != 'windows' && matrix.system != 'windows-arm' ) if: ( matrix.system != 'windows' && matrix.system != 'windows-arm' )
run: | run: |
@@ -262,6 +303,8 @@ jobs:
python -m pytest -raP $PYTEST_ARGS --color=yes ${{ inputs.tests_directory || '.' }}/${{ inputs.apptest_directory }} python -m pytest -raP $PYTEST_ARGS --color=yes ${{ inputs.tests_directory || '.' }}/${{ inputs.apptest_directory }}
} }
# Upload artifacts
- name: 📤 Upload 'TestReportSummary.xml' artifact - name: 📤 Upload 'TestReportSummary.xml' artifact
if: inputs.apptest_xml_artifact != '' if: inputs.apptest_xml_artifact != ''
uses: pyTooling/upload-artifact@v6 uses: pyTooling/upload-artifact@v6

View File

@@ -42,6 +42,11 @@ on:
required: false required: false
default: 'xelatex' default: 'xelatex'
type: string type: string
halt-on-error:
description: 'Halt on first error, otherwise continue as long as possible.'
required: false
default: 'true'
type: string
pdf_artifact: pdf_artifact:
description: 'Name of the PDF documentation artifact.' description: 'Name of the PDF documentation artifact.'
required: false required: false
@@ -58,29 +63,27 @@ jobs:
name: 📓 Converting LaTeX Documentation to PDF name: 📓 Converting LaTeX Documentation to PDF
runs-on: "ubuntu-${{ inputs.ubuntu_image_version }}" runs-on: "ubuntu-${{ inputs.ubuntu_image_version }}"
continue-on-error: ${{ inputs.can-fail == 'true' }} continue-on-error: ${{ inputs.can-fail == 'true' }}
container:
image: pytooling/miktex:sphinx
volumes:
- ${{ github.workspace }}/latex:/latex
steps: steps:
- name: 📥 Download artifacts '${{ inputs.latex_artifact }}' from 'SphinxDocumentation' job - name: 📥 Download artifacts '${{ inputs.latex_artifact }}' from 'SphinxDocumentation' job
uses: pyTooling/download-artifact@v7 uses: pyTooling/download-artifact@v7
with: with:
name: ${{ inputs.latex_artifact }} name: ${{ inputs.latex_artifact }}
path: latex path: latex
investigate: 'true'
# - name: Debug
# run: |
# tree -pash .
- name: Build LaTeX document using 'pytooling/miktex:sphinx' - name: Build LaTeX document using 'pytooling/miktex:sphinx'
uses: addnab/docker-run-action@v3
if: inputs.pdf_artifact != '' if: inputs.pdf_artifact != ''
with:
image: pytooling/miktex:sphinx
options: -v ${{ github.workspace }}/latex:/latex --workdir /latex
run: | run: |
# which ${{ inputs.processor }} if [[ "${{ inputs.halt-on-error }}" == "true" ]]; then
# pwd HALT_ON_ERROR="--halt-on-error"
# ls -lAh fi
latexmk -${{ inputs.processor }} "${{ inputs.document }}.tex" cd latex
latexmk --${{ inputs.processor }} --interaction=nonstopmode -file-line-error -max-print-line=250 ${HALT_ON_ERROR} "${{ inputs.document }}.tex"
- name: 📤 Upload 'PDF Documentation' artifact - name: 📤 Upload 'PDF Documentation' artifact
uses: pyTooling/upload-artifact@v6 uses: pyTooling/upload-artifact@v6

View File

@@ -215,6 +215,7 @@ jobs:
# run: | # run: |
# py -3.12 -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
# TODO: extract step to an Action so package, so code can be shared with AppTesting.yml
- name: Compute path to requirements file - name: Compute path to requirements file
id: requirements id: requirements
shell: python shell: python
@@ -247,6 +248,7 @@ jobs:
else: else:
print(f"requirements list: {requirements}") print(f"requirements list: {requirements}")
# TODO: extract step to an Action so package lists are shared with UnitTesting (and GHDL?)
- name: Compute pacman/pacboy packages - name: Compute pacman/pacboy packages
id: pacboy id: pacboy
if: matrix.system == 'msys2' if: matrix.system == 'msys2'
@@ -292,7 +294,7 @@ jobs:
"numpy": "python-numpy:p", "numpy": "python-numpy:p",
"markupsafe": "python-markupsafe:p", "markupsafe": "python-markupsafe:p",
"pip": "python-pip: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",
# "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",

View File

@@ -164,12 +164,12 @@ Example Pipelines
.. code-block:: toml .. code-block:: toml
[build-system] [build-system]
requires = ["setuptools >= 80.0", "wheel ~= 0.45.0", "pyTooling ~= 8.11"] requires = ["setuptools >= 80.0", "pyTooling ~= 8.12"]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"
[tool.mypy] [tool.mypy]
packages = ["myPackage"] packages = ["myPackage"]
python_version = "3.13" python_version = "3.14"
strict = true strict = true
pretty = true pretty = true
show_error_context = true show_error_context = true

View File

@@ -1,19 +1,19 @@
-r ../requirements.txt -r ../requirements.txt
pyTooling ~= 8.11 pyTooling ~= 8.12
# Enforce latest version on ReadTheDocs # Enforce latest version on ReadTheDocs
sphinx ~= 8.2 sphinx ~= 9.1
docutils ~= 0.21.0 docutils ~= 0.22.0
docutils_stubs ~= 0.0.22 docutils_stubs ~= 0.0.22
# ReadTheDocs Theme # ReadTheDocs Theme
sphinx_rtd_theme ~= 3.0 sphinx_rtd_theme ~= 3.0
# Sphinx Extenstions # Sphinx Extenstions
sphinxcontrib-mermaid ~= 1.2 sphinxcontrib-mermaid ~= 2.0
autoapi >= 2.0.1 autoapi >= 2.0.1
sphinx_design ~= 0.6.0 sphinx_design ~= 0.7.0
sphinx-copybutton >= 0.5.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_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" __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.4.0" __version__ = "7.4.4"
__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,7 @@
[build-system] [build-system]
requires = [ requires = [
"setuptools >= 80.0", "setuptools >= 80.0",
"wheel ~= 0.45.0", "pyTooling ~= 8.12"
"pyTooling ~= 8.11"
] ]
build-backend = "setuptools.build_meta" build-backend = "setuptools.build_meta"
@@ -26,7 +25,7 @@ variable-naming-style = "camelCase"
[tool.mypy] [tool.mypy]
packages = ["myPackage", "myFramework.Extension"] packages = ["myPackage", "myFramework.Extension"]
python_version = "3.13" python_version = "3.14"
strict = true strict = true
pretty = true pretty = true
show_error_context = true show_error_context = true

View File

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