Allow passing multiple branches build via CLI

Author: hugovk

README.md

@@ -17,7 +17,7 @@ python3 ./build_docs.py --quick --build-root ./build_root --www-root ./www --log
 ```
 
 If you don't need to build all translations of all branches, add
-`--language en --branch main`.
+`--language en --branches main`.
 
 
 ## Check current version

build_docs.py

@@ -86,16 +86,18 @@ def from_json(cls, data) -> Versions:
         )
         return cls(versions)
 
-    def filter(self, branch: str = "") -> Sequence[Version]:
+    def filter(self, branches: list[str] = None) -> Sequence[Version]:
         """Filter the given versions.
 
-        If *branch* is given, only *versions* matching *branch* are returned.
+        If *branches* is given, only *versions* matching *branches* are returned.
 
         Else all live versions are returned (this means no EOL and no
         security-fixes branches).
         """
-        if branch:
-            return [v for v in self if branch in (v.name, v.branch_or_tag)]
+        if branches:
+            return [
+                v for v in self if v.name in branches or v.branch_or_tag in branches
+            ]
         return [v for v in self if v.status not in {"EOL", "security-fixes"}]
 
     @property
@@ -935,9 +937,11 @@ def parse_args():
     )
     parser.add_argument(
         "-b",
-        "--branch",
+        "--branch",  # Deprecated
+        "--branches",
+        nargs="*",
         metavar="3.12",
-        help="Version to build (defaults to all maintained branches).",
+        help="Versions to build (defaults to all maintained branches).",
     )
     parser.add_argument(
         "-r",

tests/test_build_docs_versions.py

@@ -35,7 +35,28 @@ def test_filter_one() -> None:
     ])
 
     # Act
-    filtered = versions.filter("3.13")
+    filtered = versions.filter(["3.13"])
 
     # Assert
     assert filtered == [Version("3.13", status="security")]
+
+
+def test_filter_multiple() -> None:
+    # Arrange
+    versions = Versions([
+        Version("3.14", status="feature"),
+        Version("3.13", status="bugfix"),
+        Version("3.12", status="bugfix"),
+        Version("3.11", status="security"),
+        Version("3.10", status="security"),
+        Version("3.9", status="security"),
+    ])
+
+    # Act
+    filtered = versions.filter(["3.13", "3.14"])
+
+    # Assert
+    assert filtered == [
+        Version("3.14", status="feature"),
+        Version("3.13", status="security"),
+    ]