Merge branch 'main' into r1

(cherry picked from commit 33b99a3b4e)

.github/workflows/ArtifactCleanUp.yml

@@ -36,23 +36,19 @@ on:
         type: string
 
 jobs:
-
   ArtifactCleanUp:
     name: 🗑️ Artifact Cleanup
     runs-on: ubuntu-latest
 
     steps:
-
       - name: 🗑️ Delete package Artifacts
         if: ${{ ! startsWith(github.ref, 'refs/tags') }}
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ inputs.package }}
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🗑️ Delete remaining Artifacts
         if: ${{ inputs.remaining != '' }}
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ inputs.remaining }}
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/CheckDocumentation.yml

@@ -47,10 +47,10 @@ jobs:
       - name: ⏬ Checkout repository
         uses: actions/checkout@v4
 
-      - name: 🐍 Setup Python 3.11
+      - name: 🐍 Setup Python ${{ inputs.python_version }}
         uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: ${{ inputs.python_version }}
 
       - name: 🔧 Install wheel,tomli and pip dependencies (native)
         run: |

.github/workflows/IntermediateCleanUp.yml

@@ -39,17 +39,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🗑️ Delete SQLite coverage artifacts from matrix jobs
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         if: inputs.sqlite_coverage_artifacts_prefix != ''
         continue-on-error: true
         with:
           name: ${{ inputs.sqlite_coverage_artifacts_prefix }}*
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🗑️ Delete XML coverage artifacts from matrix jobs
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         if: inputs.xml_unittest_artifacts_prefix != ''
         continue-on-error: true
         with:
           name: ${{ inputs.xml_unittest_artifacts_prefix }}*
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/Parameters.yml

@@ -140,6 +140,7 @@ jobs:
           for disable in disabled:
             print(f"::warning title=Disabled Python Job::System '{disable}' temporary disabled.")
 
+          # see https://raw.githubusercontent.com/actions/python-versions/main/versions-manifest.json
           data = {
             # Python and PyPy versions supported by "setup-python" action
             "python": {
@@ -157,9 +158,9 @@ jobs:
             },
             # Runner systems (runner images) supported by GitHub Actions
             "sys": {
-              "ubuntu":  { "icon": "🐧", "runs-on": "ubuntu-latest",  "shell": "bash", "name": "Linux (x86-64)"   },
-              "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)" },
-              "macos":   { "icon": "🍎", "runs-on": "macos-latest",   "shell": "bash", "name": "MacOS (x86-64)"   },
+              "ubuntu":  { "icon": "🐧", "runs-on": "ubuntu-latest",  "shell": "bash", "name": "Linux (x86-64)",   "minPy": (3,  7)},
+              "windows": { "icon": "🪟", "runs-on": "windows-latest", "shell": "pwsh", "name": "Windows (x86-64)", "minPy": (3,  7)},
+              "macos":   { "icon": "🍎", "runs-on": "macos-latest",   "shell": "bash", "name": "MacOS (x86-64)",   "minPy": (3, 10)},
             },
             # Runtimes provided by MSYS2
             "runtime": {
@@ -182,12 +183,17 @@ jobs:
           for disable in disabled:
             print(f"- {disable}")
 
+          def toVersion(value):
+            major, minor = value.split(".")
+            return int(major[-1]), int(minor)
+
           combinations = [
             (system, version)
             for system in systems
               if system in data["sys"]
             for version in versions
               if version in data["python"]
+              and toVersion(version) >= data["sys"][system]["minPy"]
               and f"{system}:{version}" not in excludes
               and f"{system}:{version}" not in disabled
           ] + [
@@ -201,6 +207,7 @@ jobs:
             for system, version in includes
               if system in data["sys"]
               and version in data["python"]
+              and toVersion(version) >= data["sys"][system]["minPy"]
               and f"{system}:{version}" not in disabled
           ]
           print(f"Combinations ({len(combinations)}):")

.github/workflows/PublishOnPyPI.yml

@@ -78,6 +78,6 @@ jobs:
         run: twine upload dist/*.whl
 
       - name: 🗑️ Delete packaging Artifacts
-        uses: geekyeggo/delete-artifact@v4
+        uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ inputs.artifact }}

.github/workflows/UnitTesting.yml

@@ -165,11 +165,13 @@ jobs:
             "sphinx":      "python-markupsafe:p",
             "tomli":       "python-tomli:p",
             "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",
           }
           subPackages = {
             "pytooling": {
               "yaml":      "python-ruamel-yaml:p python-ruamel.yaml.clib:p",
-            }
+            },
           }
 
           regExp = compile(r"(?P<PackageName>[\w_\-\.]+)(?:\[(?P<SubPackages>(?:\w+)(?:\s*,\s*\w+)*)\])?(?:\s*(?P<Comperator>[<>~=]+)\s*)(?P<Version>\d+(?:\.\d+)*)(?:-(?P<VersionExtension>\w+))?")

.github/workflows/_Checking_Parameters.yml

@@ -84,6 +84,8 @@ jobs:
           expectedPythons = ["3.8", "3.9", "3.10", "3.11", "3.12"]
           expectedSystems = ["ubuntu", "windows", "macos"]
           expectedJobs =    [f"{system}:{python}" for system in expectedSystems for python in expectedPythons] + ["mingw64:3.11", "ucrt64:3.11"]
+          expectedJobs.remove("macos:3.8")
+          expectedJobs.remove("macos:3.9")
           expectedName =    "Example"
           expectedArtifacts = {
             "unittesting_xml":     f"{expectedName}-UnitTestReportSummary-XML",
@@ -112,8 +114,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")
@@ -140,6 +146,9 @@ jobs:
           expectedPythons = ["3.9", "3.10", "pypy-3.8", "pypy-3.9"]
           expectedSystems = ["ubuntu", "windows", "macos"]
           expectedJobs =    [f"{system}:{python}" for system in expectedSystems for python in expectedPythons] + ["mingw64:3.11", "ucrt64:3.11"]
+          expectedJobs.remove("macos:3.9")
+          expectedJobs.remove("macos:pypy-3.8")
+          expectedJobs.remove("macos:pypy-3.9")
           expectedName =    "Example"
           expectedArtifacts = {
             "unittesting_xml":     f"{expectedName}-UnitTestReportSummary-XML",
@@ -168,8 +177,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")
@@ -224,8 +237,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")
@@ -280,8 +297,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")
@@ -336,8 +357,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")
@@ -392,8 +417,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")
@@ -448,8 +477,12 @@ jobs:
             errors += 1
           if len(actualPythonJobs) != len(expectedJobs):
             print(f"Number of 'python_jobs' does not match: {len(actualPythonJobs)} != {len(expectedJobs)}.")
+            print("Actual jobs:")
             for job in actualPythonJobs:
               print(f"  {job['system']}:{job['python']}")
+            print("Expected jobs:")
+            for job in expectedJobs:
+              print(f"  {job}")
             errors += 1
           if len(actualArtifactNames) != len(expectedArtifacts):
             print(f"Number of 'artifact_names' does not match: {len(actualArtifactNames)} != {len(expectedArtifacts)}.")

doc/Instantiation.rst

@@ -80,7 +80,7 @@ Documentation Only (Sphinx)
 
        steps:
          - name: 🗑️ Delete artifacts
-           uses: geekyeggo/delete-artifact@v2
+           uses: geekyeggo/delete-artifact@v5
            with:
              name: Documentation
 

doc/requirements.txt

@@ -1,10 +1,10 @@
 -r ../requirements.txt
 
-pyTooling ~= 6.0
+pyTooling ~= 6.1
 
 # Enforce latest version on ReadTheDocs
-sphinx >= 7.1, < 8.0
-docutils >= 0.18.0, < 0.19.0
+sphinx ~= 7.3
+docutils ~= 0.18.0
 
 # Sphinx Extenstions
 #sphinx.ext.coverage
@@ -16,5 +16,5 @@ sphinxcontrib-mermaid>=0.9.2
 autoapi >= 2.0.1
 sphinx_fontawesome >= 0.0.6
 sphinx-inline-tabs >= 2023.4.21
-sphinx_autodoc_typehints >= 1.24.0
+sphinx_autodoc_typehints ~= 2.1
 # changelog>=0.3.5

pyproject.toml

@@ -1,8 +1,8 @@
 [build-system]
 requires = [
-  "setuptools >= 69.0.0",
-  "wheel >= 0.40.0",
-  "pyTooling ~= 6.0"
+  "setuptools ~= 69.5",
+  "wheel ~= 0.40.0",
+  "pyTooling ~= 6.1"
 ]
 build-backend = "setuptools.build_meta"
 

releaser/composite/action.yml

@@ -45,7 +45,9 @@ runs:
   steps:
 
   - shell: bash
-    run: pip install --disable-pip-version-check PyGithub --progress-bar off
+    run: |
+      [ "$(source /etc/os-release && echo $VERSION_ID)" == "24.04" ] && UBUNTU_2404_ARGS='--break-system-packages' || unset UBUNTU_2404_ARGS
+      pip install --disable-pip-version-check --progress-bar off $UBUNTU_2404_ARGS PyGithub
 
   - shell: bash
     run: '''${{ github.action_path }}/../releaser.py'''

requirements.txt

@@ -1 +1 @@
-pyTooling ~= 6.0
+pyTooling ~= 6.1

tests/platform/Specific.py

@@ -28,12 +28,12 @@
 # SPDX-License-Identifier: Apache-2.0                                                                                  #
 # ==================================================================================================================== #
 #
-from unittest         import TestCase
+from unittest           import TestCase
 
-from pytest           import mark
-from pyTooling.Common import CurrentPlatform
+from pytest             import mark
+from pyTooling.Platform import CurrentPlatform
 
-from pyDummy          import Application
+from pyDummy            import Application
 
 
 if __name__ == "__main__":  # pragma: no cover

tests/requirements.txt

@@ -1,13 +1,13 @@
 -r ../requirements.txt
 
 # Coverage collection
-Coverage >= 7.4
+Coverage ~= 7.5
 
 # Test Runner
-pytest >= 7.4.0
-pytest-cov >= 4.1.0
+pytest ~= 8.1
+pytest-cov ~= 5.0
 
 # Static Type Checking
-mypy >= 1.8.0
-typing_extensions >= 4.9.0
-lxml >= 5.0
+mypy ~= 1.10
+typing_extensions ~= 4.11
+lxml ~= 5.1

with-post-step/action.yml

@@ -37,6 +37,6 @@ inputs:
     default: POST
 
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'main.js'
   post: 'main.js'