[pull] develop from baserow:develop

backend/pyproject.toml

@@ -152,6 +152,9 @@ dev = [
     "build",
     "rust-just>=1.46.0",
 ]
+changelog = [
+    "typer==0.24.1",
+]
 
 [tool.hatch.metadata]
 allow-direct-references = true

changelog/README.md

@@ -2,27 +2,12 @@
 This util allows you to generate changelog entries without causing merge conflicts.
 
 ## Getting started
-### Setup environment
-Go into the `changelog` folder and run the following commands
 
-#### Create virtual environment
-```shell
-python3 -m venv venv
-```
-
-#### Activate environment
-```shell
-source venv/bin/activate
-```
-
-#### Install dependencies
-```shell
-python3 -m pip install -r requirements.txt
-```
+All changelog commands run from the repo root via `just`:
 
 ### Add a new entry
 ```shell
-python3 ./src/changelog.py add
+just changelog add
 ```
 The command will ask you for the required information to create a new changelog entry.
 
@@ -33,7 +18,7 @@ your workflow.
 
 ### Make a release
 ```shell
-python3 ./src/changelog.py release <name-of-the-release>
+just changelog release <name-of-the-release>
 ```
 
 The command will do the following:
@@ -46,7 +31,7 @@ After you made a release you can move the `changelog.md` file to the root of the
 ## Additional commands
 ### Purge
 ```shell
-python3 ./src/changelog.py purge
+just changelog purge
 ```
 
 This command will delete:
@@ -58,7 +43,7 @@ Be careful when running `purge` since it will delete these files permanently!
 
 ### Generate
 ```shell
-python3 ./src/changelog.py generate
+just changelog generate
 ```
 This command will generate a new `changelog.md` file without making a new release.
 
@@ -97,4 +82,4 @@ via the CLI.
 ### What should I do if I need to make changes to an existing release?
 If you have generated a new release, and you notice afterwards that you meant to change
 one of the entries before making the release you can change the content of the changelog
-entry in the JSON file directly and then run `python3 ./src/changelog.py generate`
+entry in the JSON file directly and then run `just changelog generate`

changelog/entries/unreleased/bug/fix_reusable_password_reset_tokens.json

@@ -3,7 +3,7 @@
     "message": "Fix password reset tokens not being invalidated after use, allowing persistent account takeover. Tokens are now single-use, token expiry reduced to 1 hour, and a confirmation email is sent on every password change.",
     "issue_origin": "github",
     "issue_number": 5165,
-    "domain": "backend",
+    "domain": "core",
     "bullet_points": [],
     "created_at": "2026-04-10"
 }

changelog/src/handler.py

@@ -1,15 +1,16 @@
+import glob
 import json
 import os
 import shutil
-import glob
+import subprocess
 from datetime import datetime, timezone
 from json import JSONDecodeError
 from pathlib import Path
+from shutil import which
 from typing import Dict, List, Optional, Union
 
-from domains import domain_types
 from changelog_entry import changelog_entry_types
-from pygit2 import Repository
+from domains import domain_types
 
 LINE_BREAK_CHARACTER = "\n"
 INDENT_CHARACTER = "  "
@@ -250,11 +251,18 @@ def generate_entry_file_name(
 
     @staticmethod
     def get_issue_number() -> Union[int, None]:
-        potential_issue_number = Repository(".").head.shorthand.split("-")[0]
-
         try:
-            return int(potential_issue_number)
-        except ValueError:
+            git_path = which("git")
+            if git_path is None:
+                return None
+            branch = subprocess.run(  # noqa: S603
+                [git_path, "rev-parse", "--abbrev-ref", "HEAD"],
+                capture_output=True,
+                text=True,
+                check=True,
+            ).stdout.strip()
+            return int(branch.split("-")[0])
+        except (OSError, subprocess.CalledProcessError, ValueError):
             return None
 
     def write_release_meta_data(self, name: str):

changelog/tests/changelog/test_changelog_handler.py

@@ -1,4 +1,6 @@
 import json
+import subprocess
+from unittest.mock import patch
 
 from src.changelog_entry import BugChangelogEntry
 from src.handler import MAXIMUM_FILE_NAME_MESSAGE_LENGTH, ChangelogHandler
@@ -162,3 +164,32 @@ def test_is_release_name_unique(fs):
 
     assert ChangelogHandler().is_release_name_unique("exists") is False
     assert ChangelogHandler().is_release_name_unique("not exists") is True
+
+
+def test_get_issue_number_numeric_branch():
+    result = subprocess.CompletedProcess(args=[], returncode=0, stdout="123-my-feature\n")
+    with patch("src.handler.which", return_value="/usr/bin/git"), patch(
+        "src.handler.subprocess.run", return_value=result
+    ):
+        assert ChangelogHandler.get_issue_number() == 123
+
+
+def test_get_issue_number_non_numeric_branch():
+    result = subprocess.CompletedProcess(args=[], returncode=0, stdout="feature-branch\n")
+    with patch("src.handler.which", return_value="/usr/bin/git"), patch(
+        "src.handler.subprocess.run", return_value=result
+    ):
+        assert ChangelogHandler.get_issue_number() is None
+
+
+def test_get_issue_number_git_not_found():
+    with patch("src.handler.which", return_value=None):
+        assert ChangelogHandler.get_issue_number() is None
+
+
+def test_get_issue_number_git_fails():
+    with patch("src.handler.which", return_value="/usr/bin/git"), patch(
+        "src.handler.subprocess.run",
+        side_effect=subprocess.CalledProcessError(128, "git"),
+    ):
+        assert ChangelogHandler.get_issue_number() is None