From d7759bf876be2c9f2761e0ca9ed6ad24066dedc1 Mon Sep 17 00:00:00 2001 From: Joe Rickerby Date: Mon, 8 May 2023 21:05:24 +0100 Subject: [PATCH] Fix a few types to keep pyright happy --- cibuildwheel/architecture.py | 6 +++++- cibuildwheel/logger.py | 9 +++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cibuildwheel/architecture.py b/cibuildwheel/architecture.py index 9d9af38b..a891ca2a 100644 --- a/cibuildwheel/architecture.py +++ b/cibuildwheel/architecture.py @@ -10,7 +10,11 @@ from enum import Enum from ._compat.typing import Final, Literal, assert_never from .typing import PlatformName -PRETTY_NAMES: Final = {"linux": "Linux", "macos": "macOS", "windows": "Windows"} +PRETTY_NAMES: Final[dict[PlatformName, str]] = { + "linux": "Linux", + "macos": "macOS", + "windows": "Windows", +} ARCH_SYNONYMS: Final[list[dict[PlatformName, str | None]]] = [ {"linux": "x86_64", "macos": "x86_64", "windows": "AMD64"}, diff --git a/cibuildwheel/logger.py b/cibuildwheel/logger.py index bc63a3aa..9a546c97 100644 --- a/cibuildwheel/logger.py +++ b/cibuildwheel/logger.py @@ -5,19 +5,20 @@ import os import re import sys import time -from typing import IO, AnyStr +from typing import IO, AnyStr, Tuple from ._compat.typing import Final from .util import CIProvider, detect_ci_provider -DEFAULT_FOLD_PATTERN: Final = ("{name}", "") -FOLD_PATTERNS: Final = { +FoldPattern = Tuple[str, str] +DEFAULT_FOLD_PATTERN: Final[FoldPattern] = ("{name}", "") +FOLD_PATTERNS: Final[dict[str, FoldPattern]] = { "azure": ("##[group]{name}", "##[endgroup]"), "travis": ("travis_fold:start:{identifier}\n{name}", "travis_fold:end:{identifier}"), "github": ("::group::{name}", "::endgroup::{name}"), } -PLATFORM_IDENTIFIER_DESCRIPTIONS: Final = { +PLATFORM_IDENTIFIER_DESCRIPTIONS: Final[dict[str, str]] = { "manylinux_x86_64": "manylinux x86_64", "manylinux_i686": "manylinux i686", "manylinux_aarch64": "manylinux aarch64",