From 6d84311338a12b0e268765741e97a792d90ea85f Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Thu, 25 Apr 2024 22:09:29 +0200 Subject: [PATCH] Revert "Also handle pypy versions." This reverts commit be27e58d8ceb391c00df28098a3b1364b8d03aac. --- .github/workflows/Parameters.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/Parameters.yml b/.github/workflows/Parameters.yml index cc997fd..1692e60 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,17 +183,13 @@ 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 [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] and f"{system}:{version}" not in excludes and f"{system}:{version}" not in disabled ] + [ @@ -207,7 +203,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 [int(i) for i in version.split(".")] >= data["sys"][system]["minPy"] and f"{system}:{version}" not in disabled ] print(f"Combinations ({len(combinations)}):")