Revert branch iteration to 3.6

Author: m-aciek

completion.py

@@ -1,5 +1,4 @@
 import json
-from collections.abc import Iterator
 from dataclasses import dataclass
 from functools import cache
 from pathlib import Path
@@ -13,28 +12,17 @@
 
 
 @cache
-def latest_branch_from_devguide(devguide_dir: Path) -> str:
+def branches_from_devguide(devguide_dir: Path) -> list[str]:
     p = devguide_dir.joinpath('include/release-cycle.json')
-    for branch in (data := json.loads(p.read_text())):
-        if data[branch]['status'] in ('bugfix', 'security'):
-            return branch
-    raise ValueError(f'Supported release not found in {p}')
-
-
-def iterate_branches(latest: str) -> Iterator[str]:
-    yield latest
-    major, minor = latest.split('.')
-    while int(minor) > 6:  # hu has 3.6 branch, hi has 3.7
-        minor = str(int(minor) - 1)
-        yield f'{major}.{minor}'
-    yield 'master'
+    data = json.loads(p.read_text())
+    return [
+        branch for branch in data if data[branch]['status'] in ('bugfix', 'security')
+    ]
 
 
 def get_completion(clones_dir: str, repo: str) -> tuple[float, 'TranslatorsData']:
     clone_path = Path(clones_dir, repo)
-    for branch in iterate_branches(
-        latest_branch_from_devguide(Path(clones_dir, 'devguide'))
-    ):
+    for branch in branches_from_devguide(Path(clones_dir, 'devguide')) + ['master']:
         try:
             git.Repo.clone_from(
                 f'https://github.com/{repo}.git', clone_path, branch=branch
@@ -63,8 +51,3 @@ def get_completion(clones_dir: str, repo: str) -> tuple[float, 'TranslatorsData'
 class TranslatorsData:
     number: int
     link: str | Literal[False]
-
-
-if __name__ == '__main__':
-    for branch in iterate_branches('3.13'):
-        print(branch)

generate.py

@@ -22,7 +22,7 @@
 import contribute
 import build_status
 from visitors import get_number_of_visitors
-from completion import latest_branch_from_devguide, get_completion, TranslatorsData
+from completion import branches_from_devguide, get_completion, TranslatorsData
 from repositories import get_languages_and_repos, Language
 
 generation_time = datetime.now(timezone.utc)
@@ -35,11 +35,12 @@ def get_completion_progress() -> Iterator['LanguageProjectData']:
             devguide_dir := Path(clones_dir, 'devguide'),
             depth=1,
         )
+        latest_branch = branches_from_devguide(devguide_dir)[0]
         Repo.clone_from(
             'https://github.com/python/cpython.git',
             cpython_dir := Path(clones_dir, 'cpython'),
             depth=1,
-            branch=latest_branch_from_devguide(devguide_dir),
+            branch=latest_branch,
         )
         subprocess.run(['make', '-C', cpython_dir / 'Doc', 'venv'], check=True)
         subprocess.run(['make', '-C', cpython_dir / 'Doc', 'gettext'], check=True)