Merge remote-tracking branch 'origin/main' into new_podman_support

bin/update_docker.py

@@ -2,8 +2,8 @@
 from __future__ import annotations
 
 import configparser
+from dataclasses import dataclass
 from pathlib import Path
-from typing import NamedTuple
 
 import requests
 
@@ -11,7 +11,8 @@ DIR = Path(__file__).parent.resolve()
 RESOURCES = DIR.parent / "cibuildwheel/resources"
 
 
-class Image(NamedTuple):
+@dataclass(frozen=True)
+class Image:
     manylinux_version: str
     platform: str
     image_name: str

bin/update_virtualenv.py

@@ -6,8 +6,8 @@ import difflib
 import logging
 import subprocess
 import sys
+from dataclasses import dataclass
 from pathlib import Path
-from typing import NamedTuple
 
 import click
 import rich
@@ -36,7 +36,8 @@ GET_VIRTUALENV_URL_TEMPLATE: Final[
 ] = f"{GET_VIRTUALENV_GITHUB}/blob/{{version}}/public/virtualenv.pyz?raw=true"
 
 
-class VersionTuple(NamedTuple):
+@dataclass(frozen=True)
+class VersionTuple:
     version: Version
     version_string: str