Merge branch 'main' into r1

pyTooling · Aug 6, 2024 · 74afc5a · 74afc5a
2 parents 2e5a79e + 5dc19a5
commit 74afc5a
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 5 deletions.
diff --git a/.github/workflows/_Checking_Parameters.yml b/.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)}.")

diff --git a/releaser/composite/action.yml b/releaser/composite/action.yml
@@ -45,7 +45,9 @@ runs:
   steps:
 
   - shell: bash
-    run: pip install --disable-pip-version-check PyGithub --progress-bar off --break-system-packages
+    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'''

diff --git a/tests/platform/Specific.py b/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