Skip to content

Commit 84fafe1

Browse files
committed
Remove unrelated security check, will make own PR
1 parent 48ef89e commit 84fafe1

2 files changed

Lines changed: 8 additions & 48 deletions

File tree

release.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,6 @@ def get(
6868
@overload
6969
def get(self, key: Literal["sign_gpg"], default: bool | None = None) -> bool: ...
7070

71-
@overload
72-
def get(
73-
self, key: Literal["security_release"], default: bool | None = None
74-
) -> bool: ...
75-
7671
@overload
7772
def get(self, key: Literal["release"], default: Tag | None = None) -> Tag: ...
7873

@@ -100,9 +95,6 @@ def __getitem__(self, key: Literal["ssh_key"]) -> str | None: ...
10095
@overload
10196
def __getitem__(self, key: Literal["sign_gpg"]) -> bool: ...
10297

103-
@overload
104-
def __getitem__(self, key: Literal["security_release"]) -> bool: ...
105-
10698
@overload
10799
def __getitem__(self, key: Literal["release"]) -> Tag: ...
108100

@@ -132,9 +124,6 @@ def __setitem__(self, key: Literal["ssh_key"], value: str | None) -> None: ...
132124
@overload
133125
def __setitem__(self, key: Literal["sign_gpg"], value: bool) -> None: ...
134126

135-
@overload
136-
def __setitem__(self, key: Literal["security_release"], value: bool) -> None: ...
137-
138127
@overload
139128
def __setitem__(self, key: Literal["release"], value: Tag) -> None: ...
140129

run_release.py

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ def __init__(
222222
ssh_user: str,
223223
sign_gpg: bool,
224224
ssh_key: str | None = None,
225-
security_release: bool = False,
226225
first_state: Task | None = None,
227226
) -> None:
228227
self.tasks = tasks
@@ -249,9 +248,6 @@ def __init__(
249248
self.db["ssh_key"] = ssh_key
250249
if not self.db.get("sign_gpg"):
251250
self.db["sign_gpg"] = sign_gpg
252-
if not self.db.get("security_release"):
253-
self.db["security_release"] = security_release
254-
255251
if not self.db.get("release"):
256252
self.db["release"] = release_tag
257253

@@ -263,7 +259,6 @@ def __init__(
263259
print(f"- SSH username: {self.db['ssh_user']}")
264260
print(f"- SSH key: {self.db['ssh_key'] or 'Default'}")
265261
print(f"- Sign with GPG: {self.db['sign_gpg']}")
266-
print(f"- Security release: {self.db['security_release']}")
267262
print()
268263

269264
def checkpoint(self) -> None:
@@ -1004,34 +999,18 @@ def wait_until_all_files_are_in_folder(db: ReleaseShelf) -> None:
1004999
are_windows_files_there = f"python-{release}.exe" in all_files
10051000
are_macos_files_there = f"python-{release}-macos11.pkg" in all_files
10061001
are_linux_files_there = f"Python-{release}.tgz" in all_files
1007-
1008-
if db["security_release"]:
1009-
# For security releases, only check Linux files
1010-
are_all_files_there = are_linux_files_there
1011-
else:
1012-
# For regular releases, check all platforms
1013-
are_all_files_there = (
1014-
are_linux_files_there
1015-
and are_windows_files_there
1016-
and are_macos_files_there
1017-
)
1018-
1002+
are_all_files_there = (
1003+
are_linux_files_there and are_windows_files_there and are_macos_files_there
1004+
)
10191005
if not are_all_files_there:
10201006
linux_tick = "✅" if are_linux_files_there else "❌"
10211007
windows_tick = "✅" if are_windows_files_there else "❌"
10221008
macos_tick = "✅" if are_macos_files_there else "❌"
1023-
if db["security_release"]:
1024-
print(
1025-
f"\rWaiting for files: Linux {linux_tick} (security release mode - only checking Linux) ",
1026-
flush=True,
1027-
end="",
1028-
)
1029-
else:
1030-
print(
1031-
f"\rWaiting for files: Linux {linux_tick} Windows {windows_tick} Mac {macos_tick} ",
1032-
flush=True,
1033-
end="",
1034-
)
1009+
print(
1010+
f"\rWaiting for files: Linux {linux_tick} Windows {windows_tick} Mac {macos_tick} ",
1011+
flush=True,
1012+
end="",
1013+
)
10351014
time.sleep(1)
10361015
print()
10371016

@@ -1396,13 +1375,6 @@ def _api_key(api_key: str) -> str:
13961375
help="Path to the SSH key file to use for authentication",
13971376
type=str,
13981377
)
1399-
parser.add_argument(
1400-
"--security-release",
1401-
dest="security_release",
1402-
action="store_true",
1403-
default=False,
1404-
help="Indicate this is a security release (only checks for Linux files)",
1405-
)
14061378
args = parser.parse_args()
14071379

14081380
auth_key = args.auth_key or os.getenv("AUTH_INFO")
@@ -1498,7 +1470,6 @@ def _api_key(api_key: str) -> str:
14981470
ssh_user=args.ssh_user,
14991471
sign_gpg=not no_gpg,
15001472
ssh_key=args.ssh_key,
1501-
security_release=args.security_release,
15021473
tasks=tasks,
15031474
)
15041475
automata.run()

0 commit comments

Comments
 (0)