diff --git a/add_to_pydotorg.py b/add_to_pydotorg.py index 25dcfa7b..a10be889 100755 --- a/add_to_pydotorg.py +++ b/add_to_pydotorg.py @@ -208,12 +208,6 @@ def minor_version(release: str) -> str: return ".".join(m.groups()[:2]) -def minor_version_tuple(release: str) -> tuple[int, int]: - m = tag_cre.match(release) - assert m is not None, f"Invalid release: {release}" - return int(m.groups()[0]), int(m.groups()[1]) - - def build_file_dict( ftp_root: str, release: str, diff --git a/tests/test_add_to_pydotorg.py b/tests/test_add_to_pydotorg.py index 2e22c28d..83d780fb 100644 --- a/tests/test_add_to_pydotorg.py +++ b/tests/test_add_to_pydotorg.py @@ -116,19 +116,6 @@ def test_minor_version(release: str, expected: str) -> None: assert add_to_pydotorg.minor_version(release) == expected -@pytest.mark.parametrize( - ["release", "expected"], - [ - ("3.9.0a0", (3, 9)), - ("3.10.0b3", (3, 10)), - ("3.11.0rc2", (3, 11)), - ("3.12.15", (3, 12)), - ], -) -def test_minor_version_tuple(release: str, expected: tuple[int, int]) -> None: - assert add_to_pydotorg.minor_version_tuple(release) == expected - - @pytest.mark.parametrize( ["release", "expected"], [ diff --git a/windows-release/merge-and-upload.py b/windows-release/merge-and-upload.py index e58306dc..5e00a6d1 100644 --- a/windows-release/merge-and-upload.py +++ b/windows-release/merge-and-upload.py @@ -113,18 +113,6 @@ def download_ssh(source, dest): _run(*_std_args(PSCP), f"{UPLOAD_USER}@{UPLOAD_HOST}:{source}", dest) -def ls_ssh(dest): - if not UPLOAD_HOST or LOCAL_INDEX: - print("Skipping ls of", dest, "because UPLOAD_HOST is missing") - return - try: - _run(*_std_args(PSCP), "-ls", f"{UPLOAD_USER}@{UPLOAD_HOST}:{dest}") - except RunError as ex: - if not ex.args[1].rstrip().endswith("No such file or directory"): - raise - print(dest, "was not found") - - def url2path(url): if not UPLOAD_URL_PREFIX: raise ValueError("%UPLOAD_URL_PREFIX% was not set")