From be27e58d8ceb391c00df28098a3b1364b8d03aac Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 24 Apr 2024 00:30:55 +0200 Subject: [PATCH] Also handle pypy versions. --- .github/workflows/Parameters.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index 578a8fc..6266989 100644 --- a/.github/workflows/Parameters.yml +++ b/.github/workflows/Parameters.yml @@ -158,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)", "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]}, + "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": { @@ -183,13 +183,17 @@ jobs: for disable in disabled: print(f"- {disable}") + def toVersion(value): + major, minor = value.split(".") + return tuple(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 [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] + and toVersion(version) >= data["sys"][system]["minPy"] and f"{system}:{version}" not in excludes and f"{system}:{version}" not in disabled ] + [ @@ -203,7 +207,7 @@ jobs: for system, version in includes if system in data["sys"] and version in data["python"] - and [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] + and toVersion(version) >= data["sys"][system]["minPy"] and f"{system}:{version}" not in disabled ] print(f"Combinations ({len(combinations)}):")