Revert "Also handle pypy versions."

This reverts commit be27e58d8c.
This commit is contained in:
Patrick Lehmann
2024-04-25 22:09:29 +02:00
parent 4406abe788
commit 6d84311338

View File

@@ -158,9 +158,9 @@ jobs:
}, },
# Runner systems (runner images) supported by GitHub Actions # Runner systems (runner images) supported by GitHub Actions
"sys": { "sys": {
"ubuntu": { "icon": "🐧", "runs-on": "ubuntu-latest", "shell": "bash", "name": "Linux (x86-64)", "minPy": (3, 7)}, "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)}, "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)}, "macos": { "icon": "🍎", "runs-on": "macos-latest", "shell": "bash", "name": "MacOS (x86-64)", "minPy": [3, 10]},
}, },
# Runtimes provided by MSYS2 # Runtimes provided by MSYS2
"runtime": { "runtime": {
@@ -183,17 +183,13 @@ jobs:
for disable in disabled: for disable in disabled:
print(f"- {disable}") print(f"- {disable}")
def toVersion(value):
major, minor = value.split(".")
return int(major[-1]), int(minor)
combinations = [ combinations = [
(system, version) (system, version)
for system in systems for system in systems
if system in data["sys"] if system in data["sys"]
for version in versions for version in versions
if version in data["python"] 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 excludes
and f"{system}:{version}" not in disabled and f"{system}:{version}" not in disabled
] + [ ] + [
@@ -207,7 +203,7 @@ jobs:
for system, version in includes for system, version in includes
if system in data["sys"] if system in data["sys"]
and version in data["python"] 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 and f"{system}:{version}" not in disabled
] ]
print(f"Combinations ({len(combinations)}):") print(f"Combinations ({len(combinations)}):")