Make start_on optional

Author: encukou

docs/operations/boards.rst

@@ -12,8 +12,8 @@ Kanonickým zdrojem pravdy je ale `výpis na justice.cz <https://or.justice.cz/i
 
 
 
-Výbor od 7.5.2025
--------------------------------------------------
+Nově zvolený výbor
+------------------
 
 .. list-table::
    :header-rows: 1

docs/operations/boards.rst.jinja

@@ -12,8 +12,13 @@ Kanonickým zdrojem pravdy je ale `výpis na justice.cz <https://or.justice.cz/i
 
 
 {% for board in boards %}
+{%- if board.start_on == None %}
+Nově zvolený výbor
+------------------
+{%- else %}
 Výbor od {{ board.start_on.strftime("%-d.%-m.%Y") }}
 -------------------------------------------------
+{%- endif %}
 
 .. list-table::
    :header-rows: 1

src/pyvec_docs/boards.py

@@ -39,22 +39,40 @@ def is_treasurer(self) -> bool:
 
 
 class Board(BaseModel):
-    start_on: date
+    start_on: date | None = None
     members: list[BoardMember]
 
     model_config = {"extra": "forbid", "frozen": True}
 
     @property
-    def years(self) -> tuple[int, int]:
+    def years(self) -> tuple[int, int] | tuple[None, None]:
+        if self.start_on is None:
+            return None, None
         start_year = self.start_on.year
         return (start_year, start_year + BOARDS_MANDATE_LENGTH)
 
+    @property
+    def sort_key(self):
+        # Boards without a start date sort as starting in the future
+        if self.start_on is None:
+            return (1, None)
+        return (0, self.start_on)
+
 
 @cache
 def load_boards(path: Path | str = BOARDS_CONFIG_PATH) -> list[Board]:
+    """Load all boards, including inactive ones"""
     data = tomllib.loads(Path(path).read_text())
     return sorted(
         (Board(**board) for board in data["board"]),
-        key=attrgetter("start_on"),
+        key=attrgetter('sort_key'),
         reverse=True,
     )
+
+@cache
+def load_current_board(path: Path | str = BOARDS_CONFIG_PATH) -> Board:
+    """Load the board that is currently in power"""
+    return [
+        board for board in load_boards(path)
+        if board.start_on is not None
+    ][0]

src/pyvec_docs/boards.toml

@@ -1,11 +1,11 @@
 # The Pyvec board members in time
-# The current board is first, previous boards are listed in descending order
+# The most recent board is first, previous boards are listed in descending order
 # Each member has a `name`, `github`, and optionally a `roles` array
 #
-# "start_on" should ideally be the date of the hand-over meeting
+# "start_on" should ideally be the date from justice.cz. If missing, the board
+# doesn't officially have power yet.
 
 [[board]]
-start_on = "2025-05-07"
 
 [[board.members]]
 name = "Jakub Vysoký"

src/pyvec_docs/ext/board_dates.py

@@ -4,11 +4,12 @@
 from sphinx.application import Sphinx
 from sphinx.config import Config
 
-from pyvec_docs.boards import BOARDS_MANDATE_LENGTH, load_boards
+from pyvec_docs.boards import BOARDS_MANDATE_LENGTH, load_current_board
 
 
 def board_dates(app: Sphinx, config: Config):
-    board = load_boards()[0]
+    board = load_current_board()
+    assert board.start_on is not None
 
     board_start = board.start_on
     board_end = board_start + timedelta(days=BOARDS_MANDATE_LENGTH * 365)

src/pyvec_docs/ext/slack.py

@@ -9,7 +9,7 @@
 
 from docutils import nodes
 
-from pyvec_docs.boards import load_boards
+from pyvec_docs.boards import load_current_board
 
 
 # https://docutils.readthedocs.io/en/sphinx-docs/howto/rst-roles.html
@@ -34,6 +34,6 @@ def slack(
 
 
 def setup(app):
-    pyvec_board_years = load_boards()[0].years
+    pyvec_board_years = load_current_board().years
     app.add_role("slack", functools.partial(slack, pyvec_board_years=pyvec_board_years))
     return {"version": "1.0", "parallel_read_safe": True}

src/pyvec_docs/grants.py

@@ -18,6 +18,8 @@ def remove_comments(html):
 
 def get_board_member_name(username, voted_at, boards: list[Board]):
     for board in boards:  # sorted from the most recent
+        if board.start_on is None:
+            continue
         if voted_at > board.start_on:
             for member in board.members:
                 if member.github == username:

tests/test_scripts_generate_grants.py

@@ -14,6 +14,14 @@
 @pytest.fixture
 def boards():
     return [  # sorted!
+        Board(
+            **{
+                # No start_on; votes don't count
+                "members": [
+                    {"name": "Bob", "github": "bobby"},
+                ],
+            }
+        ),
         Board(
             **{
                 "start_on": date(2020, 1, 1),
@@ -34,6 +42,10 @@ def boards():
     ]
 
 
+def assert_boards_sorted(boards):
+    assert boards == sorted(boards)
+
+
 def test_to_date():
     assert to_date("2020-02-12T13:22:01Z") == date(2020, 2, 12)