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@v5
         with:
           name: ${{ inputs.package }}
-          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🗑️ Delete remaining Artifacts
         if: ${{ inputs.remaining != '' }}
         uses: geekyeggo/delete-artifact@v5
         with:
           name: ${{ inputs.remaining }}
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/IntermediateCleanUp.yml

@@ -44,7 +44,6 @@ jobs:
         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@v5
@@ -52,4 +51,3 @@ jobs:
         continue-on-error: true
         with:
           name: ${{ inputs.xml_unittest_artifacts_prefix }}*
-          token: ${{ secrets.GITHUB_TOKEN }}

.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/requirements.txt

@@ -3,7 +3,7 @@
 pyTooling ~= 6.1
 
 # Enforce latest version on ReadTheDocs
-sphinx ~= 7.2
+sphinx ~= 7.3
 docutils ~= 0.18.0
 
 # Sphinx Extenstions
@@ -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,7 +1,7 @@
 [build-system]
 requires = [
-  "setuptools >= 69.0.0",
+  "setuptools ~= 69.5",
-  "wheel >= 0.40.0",
+  "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'''

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 pytest             import mark
-from pyTooling.Common import CurrentPlatform
+from pyTooling.Platform import CurrentPlatform
 
-from pyDummy          import Application
+from pyDummy            import Application
 
 
 if __name__ == "__main__":  # pragma: no cover

tests/requirements.txt

@@ -8,6 +8,6 @@ pytest ~= 8.1
 pytest-cov ~= 5.0
 
 # Static Type Checking
-mypy ~= 1.9
+mypy ~= 1.10
 typing_extensions ~= 4.11
 lxml ~= 5.1