Skip to content

Commit 27ffbb4

Browse files
ambvhugovk
andauthored
Enforce typing in run_release.py and release.py (#152)
Co-authored-by: Hugo van Kemenade <[email protected]>
1 parent 555a31d commit 27ffbb4

File tree

4 files changed

+184
-94
lines changed

4 files changed

+184
-94
lines changed

mypy-requirements.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
aiohttp==3.9.4
2+
alive_progress # untyped :(
23
mypy==1.10
34
pytest
45
pytest-mock
6+
python-gnupg # untyped :(
57
sigstore==1.1.2
6-
types-requests
78
types-paramiko
9+
types-requests

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ extra_checks = true
99
warn_unreachable = true
1010

1111
exclude = [
12-
"^run_release.py$",
1312
"^tests/test_release_tag.py$",
1413
"^tests/test_run_release.py$",
1514
"^tests/test_sbom.py$",

release.py

Lines changed: 98 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,110 @@
2020
import sys
2121
import tempfile
2222
from contextlib import contextmanager
23-
from typing import Any, Callable, Generator, Self
23+
from dataclasses import dataclass
24+
from pathlib import Path
25+
from typing import (
26+
Any,
27+
Callable,
28+
Generator,
29+
Literal,
30+
Protocol,
31+
Self,
32+
overload,
33+
)
2434

2535
COMMASPACE = ", "
2636
SPACE = " "
2737
tag_cre = re.compile(r"(\d+)(?:\.(\d+)(?:\.(\d+))?)?(?:([ab]|rc)(\d+))?$")
2838

2939

30-
# Ideas stolen from Mailman's release script, Lib/tokens.py and welease
40+
class ReleaseShelf(Protocol):
41+
def close(self) -> None: ...
42+
43+
@overload
44+
def get(self, key: Literal["finished"], default: bool | None = None) -> bool: ...
45+
46+
@overload
47+
def get(
48+
self, key: Literal["completed_tasks"], default: list[Task] | None = None
49+
) -> list[Task]: ...
50+
51+
@overload
52+
def get(self, key: Literal["gpg_key"], default: str | None = None) -> str: ...
53+
54+
@overload
55+
def get(self, key: Literal["git_repo"], default: Path | None = None) -> Path: ...
56+
57+
@overload
58+
def get(self, key: Literal["auth_info"], default: str | None = None) -> str: ...
59+
60+
@overload
61+
def get(self, key: Literal["ssh_user"], default: str | None = None) -> str: ...
62+
63+
@overload
64+
def get(self, key: Literal["sign_gpg"], default: bool | None = None) -> bool: ...
65+
66+
@overload
67+
def get(self, key: Literal["release"], default: Tag | None = None) -> Tag: ...
68+
69+
@overload
70+
def __getitem__(self, key: Literal["finished"]) -> bool: ...
71+
72+
@overload
73+
def __getitem__(self, key: Literal["completed_tasks"]) -> list[Task]: ...
74+
75+
@overload
76+
def __getitem__(self, key: Literal["gpg_key"]) -> str: ...
77+
78+
@overload
79+
def __getitem__(self, key: Literal["git_repo"]) -> Path: ...
80+
81+
@overload
82+
def __getitem__(self, key: Literal["auth_info"]) -> str: ...
83+
84+
@overload
85+
def __getitem__(self, key: Literal["ssh_user"]) -> str: ...
86+
87+
@overload
88+
def __getitem__(self, key: Literal["sign_gpg"]) -> bool: ...
89+
90+
@overload
91+
def __getitem__(self, key: Literal["release"]) -> Tag: ...
92+
93+
@overload
94+
def __setitem__(self, key: Literal["finished"], value: bool) -> None: ...
95+
96+
@overload
97+
def __setitem__(
98+
self, key: Literal["completed_tasks"], value: list[Task]
99+
) -> None: ...
100+
101+
@overload
102+
def __setitem__(self, key: Literal["gpg_key"], value: str) -> None: ...
103+
104+
@overload
105+
def __setitem__(self, key: Literal["git_repo"], value: Path) -> None: ...
106+
107+
@overload
108+
def __setitem__(self, key: Literal["auth_info"], value: str) -> None: ...
109+
110+
@overload
111+
def __setitem__(self, key: Literal["ssh_user"], value: str) -> None: ...
112+
113+
@overload
114+
def __setitem__(self, key: Literal["sign_gpg"], value: bool) -> None: ...
115+
116+
@overload
117+
def __setitem__(self, key: Literal["release"], value: Tag) -> None: ...
118+
119+
120+
@dataclass
121+
class Task:
122+
function: Callable[[ReleaseShelf], None]
123+
description: str
124+
125+
def __call__(self, db: ReleaseShelf) -> Any:
126+
return getattr(self, "function")(db)
31127

32128

33129
class Tag:
@@ -139,12 +235,8 @@ def run_cmd(
139235

140236
readme_re = re.compile(r"This is Python version [23]\.\d").match
141237

142-
root = None
143-
144238

145239
def chdir_to_repo_root() -> str:
146-
global root
147-
148240
# find the root of the local CPython repo
149241
# note that we can't ask git, because we might
150242
# be in an exported directory tree!

0 commit comments

Comments
 (0)