v7.4.2

.github/workflows/ApplicationTesting.yml

@@ -37,7 +37,7 @@ on:
       requirements:
         description: 'Python dependencies to be installed through pip.'
         required: false
-        default: '-r tests/requirements.txt'
+        default: '-r ./requirements.txt'
         type: string
       pacboy:
         description: 'MSYS2 dependencies to be installed through pacboy (pacman).'
@@ -94,6 +94,39 @@ jobs:
           name: ${{ inputs.wheel }}
           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?)
       - name: Compute pacman/pacboy packages
         id: pacboy
@@ -122,7 +155,7 @@ jobs:
 
             return requirements
 
-          requirements = "${{ inputs.requirements }}"
+          requirements = "${{ steps.requirements.outputs.requirements }}"
           if requirements.startswith("-r"):
             requirementsFile = Path(requirements[2:].lstrip())
             try:
@@ -136,14 +169,14 @@ 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",        # outdated, now part of Python as tomllib
@@ -191,6 +224,8 @@ jobs:
           with github_output.open("a+") as f:
             f.write(f"pacboy_packages={' '.join(pacboyPackages)}\n")
 
+# Python setup
+
       - name: '🟦 Setup MSYS2 for ${{ matrix.runtime }}'
         uses: msys2/setup-msys2@v2
         if: matrix.system == 'msys2'
@@ -207,6 +242,8 @@ jobs:
         with:
           python-version: ${{ matrix.python }}
 
+# Python Dependency steps
+
       - name: 🔧 Install wheel and pip dependencies (native)
         if: matrix.system != 'msys2'
         run: |
@@ -222,6 +259,8 @@ jobs:
             python -m pip install --disable-pip-version-check --break-system-packages ${{ inputs.requirements }}
           fi
 
+# TODO: Before scripts?
+
       - name: 🔧 Install wheel from artifact (Ubuntu/macOS)
         if: ( matrix.system != 'windows' && matrix.system != 'windows-arm' )
         run: |
@@ -232,6 +271,8 @@ jobs:
         run: |
           python -m pip install -v --disable-pip-version-check (Get-Item .\install\*.whl).FullName
 
+# Run pytests
+
       - name: ✅ Run application tests (Ubuntu/macOS)
         if: ( matrix.system != 'windows' && matrix.system != 'windows-arm' )
         run: |
@@ -262,6 +303,8 @@ jobs:
             python -m pytest -raP $PYTEST_ARGS --color=yes ${{ inputs.tests_directory || '.' }}/${{ inputs.apptest_directory }}
           }
 
+# Upload artifacts
+
       - name: 📤 Upload 'TestReportSummary.xml' artifact
         if: inputs.apptest_xml_artifact != ''
         uses: pyTooling/upload-artifact@v6

.github/workflows/UnitTesting.yml

@@ -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
@@ -205,6 +215,7 @@ jobs:
 #        run: |
 #          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
         id: requirements
         shell: python
@@ -237,6 +248,7 @@ jobs:
           else:
             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
         id: pacboy
         if: matrix.system == 'msys2'
@@ -282,7 +294,7 @@ 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",
@@ -380,13 +392,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 }}
 

doc/index.rst

@@ -164,7 +164,7 @@ Example Pipelines
             .. code-block:: toml
 
                [build-system]
-               requires = ["setuptools >= 80.0", "wheel ~= 0.45.0", "pyTooling ~= 8.10"]
+               requires = ["setuptools >= 80.0", "wheel ~= 0.45.0", "pyTooling ~= 8.11"]
                build-backend = "setuptools.build_meta"
 
                [tool.mypy]

doc/requirements.txt

@@ -1,19 +1,19 @@
 -r ../requirements.txt
 
-pyTooling ~= 8.10
+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

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.3.0"
+__version__ =       "7.4.2"
 __keywords__ =      ["GitHub Actions"]
 __issue_tracker__ = "https://GitHub.com/pyTooling/Actions/issues"
 

pyproject.toml

@@ -2,7 +2,7 @@
 requires = [
   "setuptools >= 80.0",
   "wheel ~= 0.45.0",
-  "pyTooling ~= 8.10"
+  "pyTooling ~= 8.11"
 ]
 build-backend = "setuptools.build_meta"
 

requirements.txt

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