From 04881fc4ca780b6a11b5017880a892b77dfcdec4 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 6 Aug 2024 09:29:43 +0200 Subject: [PATCH 1/5] fix(releaser): Use '--break-system-packages' only for Ubuntu 24.04. (cherry picked from commit e444e5711216a780168a83016ad533093152f380) --- releaser/composite/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/releaser/composite/action.yml b/releaser/composite/action.yml index 3b7cc58e..bc1f1801 100644 --- 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''' From 960b7089e7c6bc4632ffcf8b83d5a7802216ecab Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 6 Aug 2024 09:44:05 +0200 Subject: [PATCH 2/5] Fixed import problem. (cherry picked from commit 33b99a3b4e10bfdea5f0d6b1d7dd0d9bd057b135) --- tests/platform/Specific.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/platform/Specific.py b/tests/platform/Specific.py index 283f069e..1ccea7d6 100644 --- 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 From ee9a3fbdcd14a1ab5a9f52c505716de82cdc2de0 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 6 Aug 2024 09:54:41 +0200 Subject: [PATCH 3/5] Remove macOS with Python 3.8, 3.9 from expected list. --- .github/workflows/_Checking_Parameters.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/_Checking_Parameters.yml b/.github/workflows/_Checking_Parameters.yml index 17c339cb..eeabfc6f 100644 --- 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", From d58db55086a6ca63f242503b4c306251ab42593a Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 6 Aug 2024 10:01:52 +0200 Subject: [PATCH 4/5] Improved actual vs. expected prints. --- .github/workflows/_Checking_Parameters.yml | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/.github/workflows/_Checking_Parameters.yml b/.github/workflows/_Checking_Parameters.yml index eeabfc6f..592bfbd4 100644 --- a/.github/workflows/_Checking_Parameters.yml +++ b/.github/workflows/_Checking_Parameters.yml @@ -114,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)}.") @@ -170,8 +174,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)}.") @@ -226,8 +234,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)}.") @@ -282,8 +294,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)}.") @@ -338,8 +354,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)}.") @@ -394,8 +414,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)}.") @@ -450,8 +474,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)}.") From 188feb556b4a37162a0512a57d821a5a770a08f7 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Tue, 6 Aug 2024 10:08:44 +0200 Subject: [PATCH 5/5] Fixed next expected parameter set. --- .github/workflows/_Checking_Parameters.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/_Checking_Parameters.yml b/.github/workflows/_Checking_Parameters.yml index 592bfbd4..652ec26d 100644 --- a/.github/workflows/_Checking_Parameters.yml +++ b/.github/workflows/_Checking_Parameters.yml @@ -146,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",