* [PATCH ezgb 0/6] Harden local CI checks
@ 2026-04-20 4:39 Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 1/6] Add local CI script Tamir Duberstein
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Add a local CI script for ezgb and grow it from the checks that
already pass to stricter formatting and type checking.
The series removes stale pytest async configuration, adds Ruff
formatting, mypy, pyright, and ty to local CI, and documents the
uv-based development workflow.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
Tamir Duberstein (6):
Add local CI script
Add mypy checks
Add Ruff format check
Add pyright checks
Add ty checks
Document local CI checks
README.md | 13 +-
ci.sh | 10 ++
pyproject.toml | 18 ++-
src/ezgb/__init__.py | 94 ++++++------
src/ezgb/_git.py | 6 +-
src/ezgb/_models.py | 13 +-
src/ezgb/_reader.py | 253 ++++++++++++++++++++++----------
src/ezgb/_types.py | 15 ++
src/ezgb/_writer.py | 41 +++---
tests/conftest.py | 207 ++++++++++++++++++--------
tests/test_ezgb.py | 363 +++++++++++++++++++++++++++++-----------------
tests/test_integration.py | 89 ++++++++----
12 files changed, 749 insertions(+), 373 deletions(-)
---
base-commit: a52cb871360374d3cc13fc941869bc1f0bd2c7c9
change-id: 20260419-stronger-type-checking-64a26f72e878
Best regards,
--
Tamir Duberstein <tamird@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH ezgb 1/6] Add local CI script
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
@ 2026-04-20 4:39 ` Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 2/6] Add mypy checks Tamir Duberstein
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Add a local CI helper with the checks that already pass: Ruff linting
and pytest.
Drop stale pytest async options at the same time. This project has no
async tests, so those settings only produced warnings.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
ci.sh | 6 ++++++
pyproject.toml | 2 --
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ci.sh b/ci.sh
new file mode 100755
index 0000000..e589443
--- /dev/null
+++ b/ci.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+set -eu
+
+uv run ruff check
+uv run pytest --durations=0
diff --git a/pyproject.toml b/pyproject.toml
index cfcf087..8ff6e08 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,8 +41,6 @@ where = ["src"]
[tool.pytest.ini_options]
testpaths = ["tests"]
addopts = "--tb=short"
-asyncio_mode = "strict"
-asyncio_default_fixture_loop_scope = "function"
[tool.mypy]
strict = true
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH ezgb 2/6] Add mypy checks
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 1/6] Add local CI script Tamir Duberstein
@ 2026-04-20 4:39 ` Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 3/6] Add Ruff format check Tamir Duberstein
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Add mypy to the local CI script after typing the shared test helpers and
fixtures.
Use a typed BugWriter test double instead of attaching ad-hoc private
attributes to BugWriter instances.
Bump requires-python to 3.10 because the typed implementation uses
TypeGuard.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
ci.sh | 1 +
pyproject.toml | 2 +-
src/ezgb/__init__.py | 14 +++-
src/ezgb/_reader.py | 162 +++++++++++++++++++++++++++----------
src/ezgb/_types.py | 14 ++++
tests/conftest.py | 147 ++++++++++++++++++++++++----------
tests/test_ezgb.py | 200 ++++++++++++++++++++++++++++------------------
tests/test_integration.py | 59 ++++++++------
8 files changed, 406 insertions(+), 193 deletions(-)
diff --git a/ci.sh b/ci.sh
index e589443..3001db2 100755
--- a/ci.sh
+++ b/ci.sh
@@ -3,4 +3,5 @@
set -eu
uv run ruff check
+uv run mypy .
uv run pytest --durations=0
diff --git a/pyproject.toml b/pyproject.toml
index 8ff6e08..aeae989 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,7 +7,7 @@ name = 'ezgb'
version = '0.1.1'
description = 'A standalone Python library for working with git-bug repositories'
readme = 'README.md'
-requires-python = '>=3.9'
+requires-python = '>=3.10'
dependencies = ['pygit2']
license = 'GPL-2.0-or-later'
license-files = ['COPYING']
diff --git a/src/ezgb/__init__.py b/src/ezgb/__init__.py
index 38f5582..f60d63e 100644
--- a/src/ezgb/__init__.py
+++ b/src/ezgb/__init__.py
@@ -23,6 +23,7 @@ from ezgb._models import (
UnsupportedFormatError,
)
from ezgb._reader import BugReader
+from ezgb._types import JsonValue
from ezgb._writer import BugWriter
__all__ = [
@@ -171,11 +172,13 @@ class GitBugRepo:
if ecode != 0 or not out.strip():
return None
try:
- raw_bugs: list[dict[str, object]] = json.loads(out)
+ raw_bugs: JsonValue = json.loads(out)
except json.JSONDecodeError:
return None
+ assert isinstance(raw_bugs, list)
results: list[BugSummary] = []
for raw in raw_bugs:
+ assert isinstance(raw, dict)
bid = str(raw.get('id', ''))
if not bid:
continue
@@ -188,9 +191,14 @@ class GitBugRepo:
if isinstance(create_time, dict) else 0)
et = (edit_time.get('timestamp', 0)
if isinstance(edit_time, dict) else 0)
+ if not isinstance(ct, (bool, int, float, str)):
+ ct = 0
+ if not isinstance(et, (bool, int, float, str)):
+ et = 0
author = raw.get('author') or {}
author_name = (author.get('name', '')
if isinstance(author, dict) else '')
+ assert isinstance(author_name, str)
author_id = (author.get('id', '')
if isinstance(author, dict) else '')
raw_labels = raw.get('labels') or []
@@ -265,11 +273,13 @@ class GitBugRepo:
if ecode != 0:
return []
try:
- raw_bugs: list[dict[str, object]] = json.loads(out)
+ raw_bugs: JsonValue = json.loads(out)
except json.JSONDecodeError:
return []
+ assert isinstance(raw_bugs, list)
results: list[Bug] = []
for raw in raw_bugs:
+ assert isinstance(raw, dict)
bid = str(raw.get('id', ''))
if not bid:
continue
diff --git a/src/ezgb/_reader.py b/src/ezgb/_reader.py
index ce3b6f1..dac4a8c 100644
--- a/src/ezgb/_reader.py
+++ b/src/ezgb/_reader.py
@@ -10,7 +10,7 @@ import json
import logging
import os
from datetime import datetime, timezone
-from typing import Any
+from typing import TypeGuard, TypeVar
import pygit2
@@ -35,12 +35,23 @@ from ezgb._models import (
Status,
UnsupportedFormatError,
)
+from ezgb._types import JsonValue
logger = logging.getLogger('ezgb')
# Length of a full git-bug entity ID (SHA-256 hex)
_ID_LENGTH = 64
+_JsonObject = dict[str, JsonValue]
+_K = TypeVar('_K')
+_T = TypeVar('_T')
+_U = TypeVar('_U')
+
+def _is_list(value: list[_T], item_ty: type[_U]) -> TypeGuard[list[_U]]:
+ return all(isinstance(item, item_ty) for item in value)
+
+def _is_dict_values(value: dict[_K, _T], value_ty: type[_U]) -> TypeGuard[dict[_K, _U]]:
+ return all(isinstance(value, value_ty) for value in value.values())
def _combine_ids(primary: str, secondary: str) -> str:
"""Interleave primary and secondary IDs into a CombinedId.
@@ -64,7 +75,6 @@ def _combine_ids(primary: str, secondary: str) -> str:
pi += 1
return ''.join(result)
-
class BugReader:
"""Reads bug and identity data from git-bug's git object storage."""
@@ -73,7 +83,7 @@ class BugReader:
gitdir = repo_path
if os.path.isdir(os.path.join(repo_path, '.git')):
gitdir = os.path.join(repo_path, '.git')
- self._pygit: Any = pygit2.Repository(gitdir)
+ self._pygit: pygit2.Repository = pygit2.Repository(gitdir)
self._bug_cache: dict[str, Bug] = {}
self._summary_cache: dict[str, BugSummary] = {}
self._identity_cache: dict[str, Identity] = {}
@@ -87,7 +97,7 @@ class BugReader:
obj = self._pygit.get(blob_hash)
except (ValueError, KeyError):
obj = None
- if obj is None or obj.type != pygit2.GIT_OBJECT_BLOB:
+ if obj is None or not isinstance(obj, pygit2.Blob):
raise BugNotFoundError('failed to read blob %s' % blob_hash)
result: str = obj.data.decode(errors='replace')
return result
@@ -98,7 +108,7 @@ class BugReader:
obj = self._pygit.get(blob_hash)
except (ValueError, KeyError):
obj = None
- if obj is None or obj.type != pygit2.GIT_OBJECT_BLOB:
+ if obj is None or not isinstance(obj, pygit2.Blob):
raise BugNotFoundError('failed to read blob %s' % blob_hash)
return bytes(obj.data)
@@ -218,7 +228,7 @@ class BugReader:
def _get_op_packs(
self, bid: str,
- ) -> tuple[list[dict[str, Any]], list[str]]:
+ ) -> tuple[list[_JsonObject], list[str]]:
"""Walk the commit chain for a bug and return operation packs
(oldest first) together with the raw blob strings.
@@ -238,18 +248,19 @@ class BugReader:
tip = ref.peel(pygit2.Commit)
self._check_format_version_tree(
tip.tree, 'version-', SUPPORTED_BUG_FORMAT)
- packs: list[dict[str, Any]] = []
+ packs: list[_JsonObject] = []
raw_blobs: list[str] = []
for _commit, blob_hash in entries:
raw = self._cat_blob(blob_hash)
try:
- pack: dict[str, Any] = json.loads(raw)
+ pack: JsonValue = json.loads(raw)
except json.JSONDecodeError:
logger.warning(
'failed to parse ops blob %s for bug %s',
blob_hash, bid,
)
continue
+ assert isinstance(pack, dict)
packs.append(pack)
raw_blobs.append(raw)
return packs, raw_blobs
@@ -285,26 +296,36 @@ class BugReader:
version_blob = tip.tree['version']
try:
- raw = self._pygit[version_blob.id].data.decode(
- errors='replace')
- data: dict[str, Any] = json.loads(raw)
+ blob = self._pygit[version_blob.id]
+ assert isinstance(blob, pygit2.Blob)
+ raw = blob.data.decode(errors='replace')
+ data: JsonValue = json.loads(raw)
except (json.JSONDecodeError, KeyError):
self._identity_cache[identity_id] = fallback
return fallback
+ assert isinstance(data, dict)
# Validate format version
fmt_version = data.get('version')
+ if fmt_version is not None:
+ assert isinstance(fmt_version, int)
if fmt_version is not None and fmt_version != SUPPORTED_IDENTITY_FORMAT:
raise UnsupportedFormatError(
'unsupported identity format: %d (expected %d)'
% (fmt_version, SUPPORTED_IDENTITY_FORMAT)
)
+ name = data.get('name', identity_id)
+ email = data.get('email', identity_id)
+ login = data.get('login', '')
+ assert isinstance(name, str)
+ assert isinstance(email, str)
+ assert isinstance(login, str)
identity = Identity(
id=identity_id,
- name=data.get('name', identity_id),
- email=data.get('email', identity_id),
- login=data.get('login', ''),
+ name=name,
+ email=email,
+ login=login,
)
self._identity_cache[identity_id] = identity
return identity
@@ -345,10 +366,13 @@ class BugReader:
"""
decoder = json.JSONDecoder()
try:
+ pack: JsonValue
pack, _ = decoder.raw_decode(blob_json)
except json.JSONDecodeError:
return []
+ assert isinstance(pack, dict)
raw_ops = pack.get('ops')
+ assert isinstance(raw_ops, list)
if not raw_ops:
return []
# Walk forward through the string to slice each op.
@@ -361,7 +385,8 @@ class BugReader:
# we need to step past commas between elements.
while blob_json[pos] in ' \t\n\r,':
pos += 1
- _, end_pos = decoder.raw_decode(blob_json, pos)
+ _decoded_op: JsonValue
+ _decoded_op, end_pos = decoder.raw_decode(blob_json, pos)
ops.append(blob_json[pos:end_pos])
pos = end_pos
return ops
@@ -393,7 +418,7 @@ class BugReader:
def build_bug(
self, bid: str,
- packs: list[dict[str, Any]] | None = None,
+ packs: list[_JsonObject] | None = None,
raw_blobs: list[str] | None = None,
) -> Bug:
"""Reconstruct a bug snapshot by replaying operation packs.
@@ -428,24 +453,36 @@ class BugReader:
op_hash_map: dict[str, Comment] = {}
for pack_idx, pack in enumerate(packs):
- author_id = pack.get('author', {}).get('id', '')
+ author_value = pack.get('author', {})
+ assert isinstance(author_value, dict)
+ author_id = author_value.get('id', '')
+ assert isinstance(author_id, str)
raw_ops = (raw_ops_per_pack[pack_idx]
if pack_idx < len(raw_ops_per_pack) else [])
- for op_idx, op in enumerate(pack.get('ops', [])):
+ ops = pack.get('ops', [])
+ assert isinstance(ops, list)
+ for op_idx, op in enumerate(ops):
+ assert isinstance(op, dict)
op_type = op.get('type', 0)
+ assert isinstance(op_type, int)
timestamp = op.get('timestamp', 0)
+ assert isinstance(timestamp, int)
raw_json = (raw_ops[op_idx]
if op_idx < len(raw_ops) else '')
op_id = self._op_hash(raw_json) if raw_json else ''
if op_type == OP_CREATE:
- title = op.get('title', '')
+ if (op_title := op.get('title')) is not None:
+ assert isinstance(op_title, str)
+ title = op_title
author = self.resolve_identity(author_id)
creator = author
created_at = self._format_timestamp(timestamp)
- message = op.get('message', '')
- if message:
- files = op.get('files') or []
+ if message := op.get('message'):
+ assert isinstance(message, str)
+ files = op.get('files', [])
+ assert isinstance(files, list)
+ assert _is_list(files, str)
combined_id = _combine_ids(bid, op_id)
cmt = Comment(
id=combined_id,
@@ -453,22 +490,29 @@ class BugReader:
text=message,
created_at=self._format_timestamp(timestamp),
count=comment_count,
- attachment_ids=list(files),
+ attachment_ids=files,
)
comments.append(cmt)
op_hash_map[op_id] = cmt
comment_count += 1
# Collect operation-level metadata
op_meta = op.get('metadata')
- if op_meta:
+ if op_meta is not None:
+ assert isinstance(op_meta, dict)
+ assert _is_dict_values(op_meta, str)
metadata.update(op_meta)
elif op_type == OP_SET_TITLE:
- title = op.get('title', title)
+ if (op_title := op.get('title')) is not None:
+ assert isinstance(op_title, str)
+ title = op_title
elif op_type == OP_ADD_COMMENT:
message = op.get('message', '')
- files = op.get('files') or []
+ assert isinstance(message, str)
+ files = op.get('files', [])
+ assert isinstance(files, list)
+ assert _is_list(files, str)
op_author = self.resolve_identity(author_id)
combined_id = _combine_ids(bid, op_id)
cmt = Comment(
@@ -477,7 +521,7 @@ class BugReader:
text=message,
created_at=self._format_timestamp(timestamp),
count=comment_count,
- attachment_ids=list(files),
+ attachment_ids=files,
)
comments.append(cmt)
op_hash_map[op_id] = cmt
@@ -485,27 +529,40 @@ class BugReader:
elif op_type == OP_SET_STATUS:
status_val = op.get('status', STATUS_OPEN)
+ assert isinstance(status_val, int)
is_open = (status_val == STATUS_OPEN)
elif op_type == OP_LABEL_CHANGE:
- for lbl in op.get('added') or []:
+ added = op.get('added', [])
+ assert isinstance(added, list)
+ for lbl in added:
+ assert isinstance(lbl, str)
labels.add(lbl)
- for lbl in op.get('removed') or []:
+ removed = op.get('removed', [])
+ assert isinstance(removed, list)
+ for lbl in removed:
+ assert isinstance(lbl, str)
labels.discard(lbl)
elif op_type == OP_EDIT_COMMENT:
target = op.get('target', '')
+ assert isinstance(target, str)
new_message = op.get('message', '')
+ assert isinstance(new_message, str)
matched = op_hash_map.get(target)
if matched is not None:
matched.text = new_message
- new_files = op.get('files') or []
+ new_files = op.get('files', [])
+ assert isinstance(new_files, list)
+ assert _is_list(new_files, str)
if new_files:
- matched.attachment_ids = list(new_files)
+ matched.attachment_ids = new_files
elif op_type == OP_SET_METADATA:
new_meta = op.get('new_metadata')
- if new_meta:
+ if new_meta is not None:
+ assert isinstance(new_meta, dict)
+ assert _is_dict_values(new_meta, str)
metadata.update(new_meta)
elif op_type == OP_NOOP:
@@ -532,7 +589,7 @@ class BugReader:
def build_bug_summary(
self, bid: str,
- packs: list[dict[str, Any]] | None = None,
+ packs: list[_JsonObject] | None = None,
) -> BugSummary:
"""Build a lightweight bug summary by replaying operation packs.
@@ -558,33 +615,52 @@ class BugReader:
comment_count = 0
for pack in packs:
- author_id = pack.get('author', {}).get('id', '')
- for op in pack.get('ops', []):
+ author_value = pack.get('author', {})
+ assert isinstance(author_value, dict)
+ author_id = author_value.get('id', '')
+ assert isinstance(author_id, str)
+ ops = pack.get('ops', [])
+ assert isinstance(ops, list)
+ for op in ops:
+ assert isinstance(op, dict)
op_type = op.get('type', 0)
+ assert isinstance(op_type, int)
if op_type == OP_CREATE:
- title = op.get('title', '')
+ if (op_title := op.get('title')) is not None:
+ assert isinstance(op_title, str)
+ title = op_title
creator_id = author_id
- created_at = self._format_timestamp(
- op.get('timestamp', 0),
- )
- if op.get('message', ''):
+ timestamp = op.get('timestamp', 0)
+ assert isinstance(timestamp, int)
+ created_at = self._format_timestamp(timestamp)
+ if message := op.get('message'):
+ assert isinstance(message, str)
comment_count += 1
elif op_type == OP_SET_TITLE:
- title = op.get('title', title)
+ if (op_title := op.get('title')) is not None:
+ assert isinstance(op_title, str)
+ title = op_title
elif op_type == OP_ADD_COMMENT:
comment_count += 1
elif op_type == OP_SET_STATUS:
status_val = op.get('status', STATUS_OPEN)
+ assert isinstance(status_val, int)
is_open = (status_val == STATUS_OPEN)
elif op_type == OP_LABEL_CHANGE:
- for lbl in op.get('added') or []:
+ added = op.get('added', [])
+ assert isinstance(added, list)
+ for lbl in added:
+ assert isinstance(lbl, str)
labels.add(lbl)
- for lbl in op.get('removed') or []:
+ removed = op.get('removed', [])
+ assert isinstance(removed, list)
+ for lbl in removed:
+ assert isinstance(lbl, str)
labels.discard(lbl)
if created_at is None:
diff --git a/src/ezgb/_types.py b/src/ezgb/_types.py
new file mode 100644
index 0000000..e3e46da
--- /dev/null
+++ b/src/ezgb/_types.py
@@ -0,0 +1,14 @@
+"""Internal type aliases."""
+from __future__ import annotations
+
+from typing import Dict, List, Union
+
+JsonValue = Union[
+ None,
+ bool,
+ int,
+ float,
+ str,
+ List['JsonValue'],
+ Dict[str, 'JsonValue'],
+]
diff --git a/tests/conftest.py b/tests/conftest.py
index 7fb167e..ed03529 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,13 +3,17 @@
Creates real git objects in temporary bare repos using pygit2 so
the BugReader can read them without subprocess mocking.
"""
+from __future__ import annotations
+
import json
-from unittest.mock import patch
+from pathlib import Path
+from typing import Iterator
import pygit2
import pytest
from ezgb._reader import BugReader
+from ezgb._types import JsonValue
from ezgb._writer import BugWriter
# -- Constants ---------------------------------------------------------------
@@ -21,10 +25,13 @@ BUG_ID = 'c' * 64
# Signature used for all test commits
_SIG = pygit2.Signature('Test', 'test@test.com')
+JsonObject = dict[str, JsonValue]
+CliResult = tuple[int, str, str]
+
# -- Test data factories -----------------------------------------------------
-def make_identity_version(name, email):
+def make_identity_version(name: str, email: str) -> str:
"""Build a JSON identity version blob (format 2)."""
return json.dumps({
'version': 2,
@@ -35,7 +42,7 @@ def make_identity_version(name, email):
})
-def make_op_pack(author_id, ops):
+def make_op_pack(author_id: str, ops: list[JsonObject]) -> str:
"""Build a JSON operation pack with author and ops array."""
return json.dumps({
'author': {'id': author_id},
@@ -43,7 +50,11 @@ def make_op_pack(author_id, ops):
})
-def make_create_op(title, message, timestamp=1700000000):
+def make_create_op(
+ title: str,
+ message: str,
+ timestamp: int = 1700000000,
+) -> JsonObject:
"""Build an OP_CREATE (type 1) operation."""
return {
'type': 1,
@@ -54,7 +65,10 @@ def make_create_op(title, message, timestamp=1700000000):
}
-def make_comment_op(message, timestamp=1700001000):
+def make_comment_op(
+ message: str,
+ timestamp: int = 1700001000,
+) -> JsonObject:
"""Build an OP_ADD_COMMENT (type 3) operation."""
return {
'type': 3,
@@ -64,17 +78,27 @@ def make_comment_op(message, timestamp=1700001000):
}
-def make_set_title_op(title, timestamp=1700002000):
+def make_set_title_op(
+ title: str,
+ timestamp: int = 1700002000,
+) -> JsonObject:
"""Build an OP_SET_TITLE (type 2) operation."""
return {'type': 2, 'timestamp': timestamp, 'title': title}
-def make_set_status_op(status, timestamp=1700003000):
+def make_set_status_op(
+ status: int,
+ timestamp: int = 1700003000,
+) -> JsonObject:
"""Build an OP_SET_STATUS (type 4) operation."""
return {'type': 4, 'timestamp': timestamp, 'status': status}
-def make_edit_comment_op(target, message, timestamp=1700002500):
+def make_edit_comment_op(
+ target: str,
+ message: str,
+ timestamp: int = 1700002500,
+) -> JsonObject:
"""Build an OP_EDIT_COMMENT (type 6) operation."""
return {
'type': 6, 'timestamp': timestamp,
@@ -82,28 +106,46 @@ def make_edit_comment_op(target, message, timestamp=1700002500):
}
-def make_label_change_op(added=None, removed=None, timestamp=1700004000):
+def make_label_change_op(
+ added: list[str] | None = None,
+ removed: list[str] | None = None,
+ timestamp: int = 1700004000,
+) -> JsonObject:
"""Build an OP_LABEL_CHANGE (type 5) operation."""
+ if added is None:
+ added = []
+ if removed is None:
+ removed = []
return {
'type': 5, 'timestamp': timestamp,
- 'added': added or [], 'removed': removed or [],
+ # Shallow copies are needed because list is invariant. We could use
+ # Sequence instead, but that's fancy for little benefit.
+ 'added': [a for a in added], 'removed': [r for r in removed],
}
-def make_set_metadata_op(metadata, timestamp=1700005000):
+def make_set_metadata_op(
+ metadata: JsonObject,
+ timestamp: int = 1700005000,
+) -> JsonObject:
"""Build an OP_SET_METADATA (type 8) operation."""
return {'type': 8, 'timestamp': timestamp, 'new_metadata': metadata}
-def make_noop_op(timestamp=1700006000):
+def make_noop_op(timestamp: int = 1700006000) -> JsonObject:
"""Build an OP_NOOP (type 7) operation."""
return {'type': 7, 'timestamp': timestamp}
# -- Real git object helpers -------------------------------------------------
-def _create_bug_commit(repo, refname, ops_json, parent_oid=None,
- version_tag='version-4'):
+def _create_bug_commit(
+ repo: pygit2.Repository,
+ refname: str,
+ ops_json: str,
+ parent_oid: pygit2.Oid | None = None,
+ version_tag: str = 'version-4',
+) -> pygit2.Oid:
"""Create a single bug commit with an ops blob and version marker.
If *parent_oid* is given the new commit is chained after it.
@@ -123,7 +165,11 @@ def _create_bug_commit(repo, refname, ops_json, parent_oid=None,
)
-def _create_identity_commit(repo, refname, version_json):
+def _create_identity_commit(
+ repo: pygit2.Repository,
+ refname: str,
+ version_json: str,
+) -> pygit2.Oid:
"""Create an identity commit with a ``version`` blob.
Returns the commit OID.
@@ -141,7 +187,12 @@ def _create_identity_commit(repo, refname, version_json):
# -- Convenience setup -------------------------------------------------------
-def setup_identity(repo_path, identity_id, name, email):
+def setup_identity(
+ repo_path: str,
+ identity_id: str,
+ name: str,
+ email: str,
+) -> None:
"""Create real identity git objects in the repo at *repo_path*.
Writes a ``refs/identities/<id>`` ref pointing at a commit whose
@@ -153,10 +204,17 @@ def setup_identity(repo_path, identity_id, name, email):
_create_identity_commit(repo, refname, version_json)
-def setup_single_bug(repo_path, reader, bid=BUG_ID, title='Test bug',
- message='Bug description', timestamp=1700000000,
- extra_ops=None, author_id=IDENTITY_ID,
- extra_packs=None):
+def setup_single_bug(
+ repo_path: str,
+ reader: BugReader,
+ bid: str = BUG_ID,
+ title: str = 'Test bug',
+ message: str = 'Bug description',
+ timestamp: int = 1700000000,
+ extra_ops: list[JsonObject] | None = None,
+ author_id: str = IDENTITY_ID,
+ extra_packs: list[str] | None = None,
+) -> None:
"""Create real git objects for a single bug with one create op.
The bug ref ``refs/bugs/<bid>`` is created in the repo at
@@ -191,8 +249,29 @@ def setup_single_bug(repo_path, reader, bid=BUG_ID, title='Test bug',
# -- Fixtures ----------------------------------------------------------------
+class RecordingBugWriter(BugWriter):
+ """BugWriter test double that records CLI calls and canned responses."""
+
+ def __init__(self, repo_path: str, reader: BugReader) -> None:
+ super().__init__(repo_path, reader)
+ self._cli_calls: list[list[str]] = []
+ self._cli_routes: dict[str, CliResult] = {}
+
+ def _cli(
+ self,
+ args: list[str],
+ stdin: str | None = None,
+ ) -> CliResult:
+ self._cli_calls.append(args)
+ joined = ' '.join(args)
+ for key, value in self._cli_routes.items():
+ if key in joined:
+ return value
+ return (0, '', '')
+
+
@pytest.fixture()
-def repo_path(tmp_path):
+def repo_path(tmp_path: Path) -> str:
"""Create a bare git repo and return its path as a string."""
repo_dir = tmp_path / 'repo'
pygit2.init_repository(str(repo_dir), bare=True)
@@ -200,37 +279,17 @@ def repo_path(tmp_path):
@pytest.fixture()
-def reader(repo_path):
+def reader(repo_path: str) -> BugReader:
"""Create a BugReader pointing at the test repo."""
return BugReader(repo_path)
@pytest.fixture()
-def writer(reader, repo_path):
+def writer(reader: BugReader, repo_path: str) -> Iterator[RecordingBugWriter]:
"""Create a BugWriter with git_bug_cli mocked.
Write operations shell out to the ``git bug`` CLI, which isn't
available in tests, so we mock it. The mock captures calls in
``writer._cli_calls`` for assertion.
"""
- cli_routes = {}
- cli_calls = []
-
- def _cli_side_effect(rp, args, stdin=None):
- cli_calls.append(args)
- joined = ' '.join(args)
- for key, value in cli_routes.items():
- if key in joined:
- if callable(value):
- return value(rp, args)
- return value
- return (0, '', '')
-
- with patch('ezgb._writer.git_bug_cli',
- side_effect=_cli_side_effect), \
- patch('ezgb._git.git_bug_cli',
- side_effect=_cli_side_effect):
- w = BugWriter(repo_path, reader)
- w._cli_calls = cli_calls
- w._cli_routes = cli_routes
- yield w
+ yield RecordingBugWriter(repo_path, reader)
diff --git a/tests/test_ezgb.py b/tests/test_ezgb.py
index 054f77f..6d9f491 100644
--- a/tests/test_ezgb.py
+++ b/tests/test_ezgb.py
@@ -13,6 +13,8 @@ import pytest
from conftest import (
BUG_ID,
IDENTITY_ID,
+ JsonObject,
+ RecordingBugWriter,
_create_bug_commit,
_create_identity_commit,
make_comment_op,
@@ -45,7 +47,7 @@ from ezgb._reader import BugReader, _combine_ids
class TestCombineIds:
"""Unit tests for the CombinedId interleaving function."""
- def test_interleave_pattern(self):
+ def test_interleave_pattern(self) -> None:
primary = '0' * 64
secondary = '1' * 64
result = _combine_ids(primary, secondary)
@@ -57,7 +59,7 @@ class TestCombineIds:
else:
assert ch == '0', 'position %d should be primary' % i
- def test_distinct_inputs(self):
+ def test_distinct_inputs(self) -> None:
primary = 'abcdef' * 10 + 'abcd'
secondary = '123456' * 10 + '1234'
result = _combine_ids(primary, secondary)
@@ -71,14 +73,14 @@ class TestCombineIds:
# ------------------------------------------------------------------
class TestResolveBugId:
- def test_resolves_full_id(self, reader, repo_path):
+ def test_resolves_full_id(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
ops_json = make_op_pack(IDENTITY_ID, [make_create_op('t', 'm')])
_create_bug_commit(repo, 'refs/bugs/%s' % BUG_ID, ops_json)
result = reader.resolve_bug_id(BUG_ID)
assert result == BUG_ID
- def test_resolves_prefix(self, reader, repo_path):
+ def test_resolves_prefix(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
ops_json = make_op_pack(IDENTITY_ID, [make_create_op('t', 'm')])
_create_bug_commit(repo, 'refs/bugs/%s' % BUG_ID, ops_json)
@@ -86,7 +88,7 @@ class TestResolveBugId:
result = reader.resolve_bug_id(prefix)
assert result == BUG_ID
- def test_caches_result(self, reader, repo_path):
+ def test_caches_result(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
ops_json = make_op_pack(IDENTITY_ID, [make_create_op('t', 'm')])
_create_bug_commit(repo, 'refs/bugs/%s' % BUG_ID, ops_json)
@@ -95,7 +97,7 @@ class TestResolveBugId:
result = reader.resolve_bug_id(BUG_ID)
assert result == BUG_ID
- def test_ambiguous_raises(self, reader, repo_path):
+ def test_ambiguous_raises(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
prefix = 'abc'
bid2 = 'abc' + 'd' * 61
@@ -106,7 +108,7 @@ class TestResolveBugId:
with pytest.raises(AmbiguousBugIdError, match='matches 2 bugs'):
reader.resolve_bug_id(prefix)
- def test_not_found_raises(self, reader, repo_path):
+ def test_not_found_raises(self, reader: BugReader, repo_path: str) -> None:
with pytest.raises(BugNotFoundError, match='no bug matching'):
reader.resolve_bug_id('nonexistent')
@@ -116,7 +118,7 @@ class TestResolveBugId:
# ------------------------------------------------------------------
class TestResolveIdentity:
- def test_resolves_by_id(self, reader, repo_path):
+ def test_resolves_by_id(self, reader: BugReader, repo_path: str) -> None:
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
identity = reader.resolve_identity(IDENTITY_ID)
assert identity.name == 'Alice'
@@ -124,18 +126,18 @@ class TestResolveIdentity:
assert identity.login == 'alice'
assert identity.id == IDENTITY_ID
- def test_caches_result(self, reader, repo_path):
+ def test_caches_result(self, reader: BugReader, repo_path: str) -> None:
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
id1 = reader.resolve_identity(IDENTITY_ID)
id2 = reader.resolve_identity(IDENTITY_ID)
assert id1 is id2
- def test_fallback_on_missing(self, reader, repo_path):
+ def test_fallback_on_missing(self, reader: BugReader, repo_path: str) -> None:
identity = reader.resolve_identity(IDENTITY_ID)
assert identity.name == IDENTITY_ID
assert identity.email == IDENTITY_ID
- def test_unsupported_format_raises(self, reader, repo_path):
+ def test_unsupported_format_raises(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
identity_json = json.dumps({
'version': 99,
@@ -153,7 +155,7 @@ class TestResolveIdentity:
# ------------------------------------------------------------------
class TestBuildBug:
- def test_snapshot_reconstruction(self, reader, repo_path):
+ def test_snapshot_reconstruction(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
bug = reader.build_bug(BUG_ID)
assert bug.id == BUG_ID
@@ -165,25 +167,25 @@ class TestBuildBug:
assert bug.comments[0].text == 'Bug description'
assert bug.comments[0].count == 0
- def test_set_title_updates(self, reader, repo_path):
+ def test_set_title_updates(self, reader: BugReader, repo_path: str) -> None:
title_op = make_set_title_op('Updated title')
setup_single_bug(repo_path, reader, extra_ops=[title_op])
bug = reader.build_bug(BUG_ID)
assert bug.title == 'Updated title'
- def test_set_status_closed(self, reader, repo_path):
+ def test_set_status_closed(self, reader: BugReader, repo_path: str) -> None:
status_op = make_set_status_op(2) # STATUS_CLOSED
setup_single_bug(repo_path, reader, extra_ops=[status_op])
bug = reader.build_bug(BUG_ID)
assert bug.status == Status.CLOSED
- def test_assigned_label(self, reader, repo_path):
+ def test_assigned_label(self, reader: BugReader, repo_path: str) -> None:
assign_op = make_label_change_op(added=['assigned:bob@example.com'])
setup_single_bug(repo_path, reader, extra_ops=[assign_op])
bug = reader.build_bug(BUG_ID)
assert 'assigned:bob@example.com' in bug.labels
- def test_label_add_and_remove(self, reader, repo_path):
+ def test_label_add_and_remove(self, reader: BugReader, repo_path: str) -> None:
add_op = make_label_change_op(added=['bug', 'priority/high'])
rm_op = make_label_change_op(
removed=['bug'], timestamp=1700005000,
@@ -193,7 +195,7 @@ class TestBuildBug:
assert 'priority/high' in bug.labels
assert 'bug' not in bug.labels
- def test_add_comment_op(self, reader, repo_path):
+ def test_add_comment_op(self, reader: BugReader, repo_path: str) -> None:
comment_op = make_comment_op('A follow-up', timestamp=1700001000)
setup_single_bug(repo_path, reader, extra_ops=[comment_op])
bug = reader.build_bug(BUG_ID)
@@ -203,8 +205,8 @@ class TestBuildBug:
assert bug.comments[1].count == 1
assert bug.comments[1].text == 'A follow-up'
- def test_comment_with_attachment(self, reader, repo_path):
- ops = [{
+ def test_comment_with_attachment(self, reader: BugReader, repo_path: str) -> None:
+ ops: list[JsonObject] = [{
'type': 1,
'timestamp': 1700000000,
'title': 'Bug with file',
@@ -228,7 +230,7 @@ class TestBuildBug:
bug = reader.build_bug(BUG_ID)
assert bug.comments[0].attachment_ids == ['blobhash123']
- def test_edit_comment(self, reader, repo_path):
+ def test_edit_comment(self, reader: BugReader, repo_path: str) -> None:
"""OP_EDIT_COMMENT whose target matches the create op hash
should update the comment text."""
# First, build the pack JSON for the create op so we can
@@ -256,7 +258,9 @@ class TestBuildBug:
bug = reader.build_bug(BUG_ID)
assert bug.comments[0].text == 'Edited text'
- def test_edit_comment_unmatched_target(self, reader, repo_path):
+ def test_edit_comment_unmatched_target(
+ self, reader: BugReader, repo_path: str,
+ ) -> None:
"""Unmatched OP_EDIT_COMMENT target leaves text unchanged."""
edit_op = make_edit_comment_op(
target='nonexistent', message='Edited text',
@@ -265,19 +269,21 @@ class TestBuildBug:
bug = reader.build_bug(BUG_ID)
assert bug.comments[0].text == 'Bug description'
- def test_metadata_from_set_metadata(self, reader, repo_path):
+ def test_metadata_from_set_metadata(
+ self, reader: BugReader, repo_path: str,
+ ) -> None:
meta_op = make_set_metadata_op({'key': 'value'})
setup_single_bug(repo_path, reader, extra_ops=[meta_op])
bug = reader.build_bug(BUG_ID)
assert bug.metadata == {'key': 'value'}
- def test_noop_ignored(self, reader, repo_path):
+ def test_noop_ignored(self, reader: BugReader, repo_path: str) -> None:
noop = make_noop_op()
setup_single_bug(repo_path, reader, extra_ops=[noop])
bug = reader.build_bug(BUG_ID)
assert bug.title == 'Test bug'
- def test_multiple_op_packs(self, reader, repo_path):
+ def test_multiple_op_packs(self, reader: BugReader, repo_path: str) -> None:
"""Operations spread across multiple commits are replayed
in order."""
pack2_json = make_op_pack(IDENTITY_ID, [
@@ -291,18 +297,18 @@ class TestBuildBug:
bug = reader.build_bug(BUG_ID)
assert bug.title == 'Updated'
- def test_missing_bug_raises(self, reader, repo_path):
+ def test_missing_bug_raises(self, reader: BugReader, repo_path: str) -> None:
reader._resolve_cache['nonexistent'] = 'nonexistent'
with pytest.raises(BugNotFoundError, match='no operation packs'):
reader.build_bug('nonexistent')
- def test_caching(self, reader, repo_path):
+ def test_caching(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
bug1 = reader.build_bug(BUG_ID)
bug2 = reader.build_bug(BUG_ID)
assert bug1 is bug2
- def test_unsupported_format_raises(self, reader, repo_path):
+ def test_unsupported_format_raises(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
ops_json = make_op_pack(IDENTITY_ID, [
make_create_op('Test', 'body'),
@@ -321,7 +327,7 @@ class TestBuildBug:
# ------------------------------------------------------------------
class TestBuildBugSummary:
- def test_basic(self, reader, repo_path):
+ def test_basic(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
s = reader.build_bug_summary(BUG_ID)
assert isinstance(s, BugSummary)
@@ -331,19 +337,19 @@ class TestBuildBugSummary:
assert s.creator_id == IDENTITY_ID
assert s.comment_count == 1 # create op has a message
- def test_set_title(self, reader, repo_path):
+ def test_set_title(self, reader: BugReader, repo_path: str) -> None:
title_op = make_set_title_op('Updated title')
setup_single_bug(repo_path, reader, extra_ops=[title_op])
s = reader.build_bug_summary(BUG_ID)
assert s.title == 'Updated title'
- def test_set_status(self, reader, repo_path):
+ def test_set_status(self, reader: BugReader, repo_path: str) -> None:
status_op = make_set_status_op(2) # CLOSED
setup_single_bug(repo_path, reader, extra_ops=[status_op])
s = reader.build_bug_summary(BUG_ID)
assert s.status == Status.CLOSED
- def test_label_changes(self, reader, repo_path):
+ def test_label_changes(self, reader: BugReader, repo_path: str) -> None:
add_op = make_label_change_op(added=['bug', 'priority/high'])
rm_op = make_label_change_op(
removed=['bug'], timestamp=1700005000,
@@ -354,13 +360,13 @@ class TestBuildBugSummary:
assert 'bug' not in s.labels
assert isinstance(s.labels, frozenset)
- def test_comment_count(self, reader, repo_path):
+ def test_comment_count(self, reader: BugReader, repo_path: str) -> None:
comment_op = make_comment_op('A follow-up')
setup_single_bug(repo_path, reader, extra_ops=[comment_op])
s = reader.build_bug_summary(BUG_ID)
assert s.comment_count == 2 # create message + add_comment
- def test_create_without_message(self, reader, repo_path):
+ def test_create_without_message(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
ops = [make_create_op('No body', '')]
pack_json = make_op_pack(IDENTITY_ID, ops)
@@ -371,7 +377,9 @@ class TestBuildBugSummary:
s = reader.build_bug_summary(BUG_ID)
assert s.comment_count == 0
- def test_edit_comment_does_not_affect_count(self, reader, repo_path):
+ def test_edit_comment_does_not_affect_count(
+ self, reader: BugReader, repo_path: str,
+ ) -> None:
edit_op = make_edit_comment_op(
target='whatever', message='Edited',
)
@@ -379,43 +387,43 @@ class TestBuildBugSummary:
s = reader.build_bug_summary(BUG_ID)
assert s.comment_count == 1 # only the create message
- def test_metadata_skipped(self, reader, repo_path):
+ def test_metadata_skipped(self, reader: BugReader, repo_path: str) -> None:
meta_op = make_set_metadata_op({'key': 'value'})
setup_single_bug(repo_path, reader, extra_ops=[meta_op])
s = reader.build_bug_summary(BUG_ID)
assert not hasattr(s, 'metadata')
- def test_noop_ignored(self, reader, repo_path):
+ def test_noop_ignored(self, reader: BugReader, repo_path: str) -> None:
noop = make_noop_op()
setup_single_bug(repo_path, reader, extra_ops=[noop])
s = reader.build_bug_summary(BUG_ID)
assert s.title == 'Test bug'
- def test_caching(self, reader, repo_path):
+ def test_caching(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
s1 = reader.build_bug_summary(BUG_ID)
s2 = reader.build_bug_summary(BUG_ID)
assert s1 is s2
- def test_separate_cache(self, reader, repo_path):
+ def test_separate_cache(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
reader.build_bug_summary(BUG_ID)
assert BUG_ID in reader._summary_cache
assert BUG_ID not in reader._bug_cache
- def test_missing_raises(self, reader, repo_path):
+ def test_missing_raises(self, reader: BugReader, repo_path: str) -> None:
reader._resolve_cache['nonexistent'] = 'nonexistent'
with pytest.raises(BugNotFoundError, match='no operation packs'):
reader.build_bug_summary('nonexistent')
- def test_invalidate_single(self, reader, repo_path):
+ def test_invalidate_single(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
reader.build_bug_summary(BUG_ID)
assert BUG_ID in reader._summary_cache
reader.invalidate(BUG_ID)
assert BUG_ID not in reader._summary_cache
- def test_invalidate_all(self, reader, repo_path):
+ def test_invalidate_all(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
reader.build_bug_summary(BUG_ID)
reader.invalidate()
@@ -427,7 +435,7 @@ class TestBuildBugSummary:
# ------------------------------------------------------------------
class TestPrefetchBugs:
- def test_warms_cache(self, reader, repo_path):
+ def test_warms_cache(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
reader._bug_cache.clear()
assert BUG_ID not in reader._bug_cache
@@ -435,13 +443,13 @@ class TestPrefetchBugs:
assert BUG_ID in reader._bug_cache
assert reader._bug_cache[BUG_ID].title == 'Test bug'
- def test_skips_cached(self, reader, repo_path):
+ def test_skips_cached(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
bug = reader.build_bug(BUG_ID)
reader.prefetch_bugs([BUG_ID])
assert reader._bug_cache[BUG_ID] is bug
- def test_empty_list(self, reader, repo_path):
+ def test_empty_list(self, reader: BugReader, repo_path: str) -> None:
reader.prefetch_bugs([])
assert reader._bug_cache == {}
@@ -451,19 +459,19 @@ class TestPrefetchBugs:
# ------------------------------------------------------------------
class TestListBugRefs:
- def test_returns_refs(self, reader, repo_path):
+ def test_returns_refs(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
refs = reader.list_bug_refs()
assert len(refs) == 1
assert refs[0][0] == BUG_ID
- def test_empty(self, reader, repo_path):
+ def test_empty(self, reader: BugReader, repo_path: str) -> None:
refs = reader.list_bug_refs()
assert refs == []
class TestListIdentityRefs:
- def test_returns_refs(self, reader, repo_path):
+ def test_returns_refs(self, reader: BugReader, repo_path: str) -> None:
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
refs = reader.list_identity_refs()
assert len(refs) == 1
@@ -475,7 +483,7 @@ class TestListIdentityRefs:
# ------------------------------------------------------------------
class TestInvalidate:
- def test_invalidate_single_bug(self, reader, repo_path):
+ def test_invalidate_single_bug(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
reader.build_bug(BUG_ID)
assert BUG_ID in reader._bug_cache
@@ -484,7 +492,7 @@ class TestInvalidate:
# Resolve cache preserved for single-bug invalidation
assert BUG_ID in reader._resolve_cache
- def test_invalidate_all(self, reader, repo_path):
+ def test_invalidate_all(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
reader.build_bug(BUG_ID)
reader.invalidate()
@@ -498,7 +506,12 @@ class TestInvalidate:
# ------------------------------------------------------------------
class TestCreateBug:
- def test_creates_and_returns_bug(self, reader, writer, repo_path):
+ def test_creates_and_returns_bug(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
new_id = 'd' * 64
prefix = new_id[:7]
@@ -524,7 +537,12 @@ class TestCreateBug:
# ------------------------------------------------------------------
class TestAddComment:
- def test_adds_and_returns_comment(self, reader, writer, repo_path):
+ def test_adds_and_returns_comment(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
setup_single_bug(repo_path, reader)
# CLI returns success
@@ -535,6 +553,7 @@ class TestAddComment:
# bug ref (the first commit already has the create op).
repo = pygit2.Repository(repo_path)
ref = repo.references.get('refs/bugs/%s' % BUG_ID)
+ assert ref is not None
parent = ref.peel(pygit2.Commit)
comment_op = make_comment_op('New comment', timestamp=1700005000)
pack_json = make_op_pack(IDENTITY_ID, [comment_op])
@@ -553,14 +572,24 @@ class TestAddComment:
# ------------------------------------------------------------------
class TestSetStatus:
- def test_close(self, reader, writer, repo_path):
+ def test_close(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
setup_single_bug(repo_path, reader)
writer.set_status(BUG_ID, Status.CLOSED)
assert any(
'close' in ' '.join(c) for c in writer._cli_calls
)
- def test_open(self, reader, writer, repo_path):
+ def test_open(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
setup_single_bug(repo_path, reader)
writer.set_status(BUG_ID, Status.OPEN)
assert any(
@@ -573,7 +602,12 @@ class TestSetStatus:
# ------------------------------------------------------------------
class TestSetTitle:
- def test_updates_title(self, reader, writer, repo_path):
+ def test_updates_title(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
setup_single_bug(repo_path, reader)
writer.set_title(BUG_ID, 'New title')
assert any(
@@ -586,14 +620,24 @@ class TestSetTitle:
# ------------------------------------------------------------------
class TestLabels:
- def test_add_label(self, reader, writer, repo_path):
+ def test_add_label(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
setup_single_bug(repo_path, reader)
writer.add_label(BUG_ID, 'priority/high')
assert any(
'priority/high' in ' '.join(c) for c in writer._cli_calls
)
- def test_remove_label(self, reader, writer, repo_path):
+ def test_remove_label(
+ self,
+ reader: BugReader,
+ writer: RecordingBugWriter,
+ repo_path: str,
+ ) -> None:
setup_single_bug(repo_path, reader)
writer.remove_label(BUG_ID, 'old-label')
assert any(
@@ -607,20 +651,20 @@ class TestLabels:
# ------------------------------------------------------------------
class TestGitBugRepo:
- def test_get_bug(self, repo_path):
+ def test_get_bug(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
setup_single_bug(repo_path, repo_obj._reader)
bug = repo_obj.get_bug(BUG_ID)
assert bug.title == 'Test bug'
- def test_list_bugs(self, repo_path):
+ def test_list_bugs(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
setup_single_bug(repo_path, repo_obj._reader)
bugs = repo_obj.list_bugs()
assert len(bugs) == 1
assert bugs[0].title == 'Test bug'
- def test_list_bugs_filter_status(self, repo_path):
+ def test_list_bugs_filter_status(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
status_op = make_set_status_op(2) # CLOSED
setup_single_bug(repo_path, repo_obj._reader, extra_ops=[status_op])
@@ -631,7 +675,7 @@ class TestGitBugRepo:
bugs = repo_obj.list_bugs(status=Status.CLOSED)
assert len(bugs) == 1
- def test_list_bugs_filter_label(self, repo_path):
+ def test_list_bugs_filter_label(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
label_op = make_label_change_op(added=['area/network'])
setup_single_bug(repo_path, repo_obj._reader, extra_ops=[label_op])
@@ -642,7 +686,7 @@ class TestGitBugRepo:
bugs = repo_obj.list_bugs(label='nonexistent')
assert len(bugs) == 0
- def test_resolve_bug_id(self, repo_path):
+ def test_resolve_bug_id(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
repo = pygit2.Repository(repo_path)
ops_json = make_op_pack(IDENTITY_ID, [make_create_op('t', 'm')])
@@ -650,21 +694,21 @@ class TestGitBugRepo:
result = repo_obj.resolve_bug_id(BUG_ID)
assert result == BUG_ID
- def test_list_identities(self, repo_path):
+ def test_list_identities(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
identities = repo_obj.list_identities()
assert len(identities) == 1
assert identities[0].name == 'Alice'
- def test_iter_bugs(self, repo_path):
+ def test_iter_bugs(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
setup_single_bug(repo_path, repo_obj._reader)
bugs = list(repo_obj.iter_bugs())
assert len(bugs) == 1
assert bugs[0].title == 'Test bug'
- def test_iter_bugs_is_lazy(self, repo_path):
+ def test_iter_bugs_is_lazy(self, repo_path: str) -> None:
"""iter_bugs yields one at a time without prefetching all."""
repo_obj = GitBugRepo(repo_path)
setup_single_bug(repo_path, repo_obj._reader)
@@ -674,7 +718,7 @@ class TestGitBugRepo:
bug = next(it)
assert bug.title == 'Test bug'
- def test_list_bug_summaries(self, repo_path):
+ def test_list_bug_summaries(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
setup_single_bug(repo_path, repo_obj._reader)
summaries = repo_obj.list_bug_summaries()
@@ -683,7 +727,7 @@ class TestGitBugRepo:
assert summaries[0].title == 'Test bug'
assert summaries[0].creator_id == IDENTITY_ID
- def test_list_bug_summaries_filter_status(self, repo_path):
+ def test_list_bug_summaries_filter_status(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
status_op = make_set_status_op(2) # CLOSED
setup_single_bug(repo_path, repo_obj._reader, extra_ops=[status_op])
@@ -692,7 +736,7 @@ class TestGitBugRepo:
repo_obj.invalidate()
assert len(repo_obj.list_bug_summaries(status=Status.CLOSED)) == 1
- def test_list_bug_summaries_filter_label(self, repo_path):
+ def test_list_bug_summaries_filter_label(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
label_op = make_label_change_op(added=['area/network'])
setup_single_bug(repo_path, repo_obj._reader, extra_ops=[label_op])
@@ -701,21 +745,21 @@ class TestGitBugRepo:
repo_obj.invalidate()
assert len(repo_obj.list_bug_summaries(label='nonexistent')) == 0
- def test_iter_bug_summaries(self, repo_path):
+ def test_iter_bug_summaries(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
setup_single_bug(repo_path, repo_obj._reader)
summaries = list(repo_obj.iter_bug_summaries())
assert len(summaries) == 1
assert summaries[0].title == 'Test bug'
- def test_get_attachment(self, repo_path):
+ def test_get_attachment(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
repo = pygit2.Repository(repo_path)
blob_oid = repo.create_blob(b'file contents here')
data = repo_obj.get_attachment(str(blob_oid))
assert data == b'file contents here'
- def test_list_bugs_since(self, repo_path):
+ def test_list_bugs_since(self, repo_path: str) -> None:
"""list_bugs(since=...) filters by committer timestamp."""
repo_obj = GitBugRepo(repo_path)
# Create bug with a specific commit timestamp
@@ -747,7 +791,7 @@ class TestGitBugRepo:
bugs = repo_obj.list_bugs(since=1700010000)
assert len(bugs) == 0
- def test_list_bugs_since_string(self, repo_path):
+ def test_list_bugs_since_string(self, repo_path: str) -> None:
"""list_bugs(since='2023-11-14 ...') parses the string."""
repo_obj = GitBugRepo(repo_path)
repo = pygit2.Repository(repo_path)
@@ -776,14 +820,14 @@ class TestGitBugRepo:
# ------------------------------------------------------------------
class TestCatBlobBytes:
- def test_reads_bytes(self, reader, repo_path):
+ def test_reads_bytes(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
blob_oid = repo.create_blob(b'binary content')
data = reader.cat_blob_bytes(str(blob_oid))
assert data == b'binary content'
assert isinstance(data, bytes)
- def test_missing_blob_raises(self, reader, repo_path):
+ def test_missing_blob_raises(self, reader: BugReader, repo_path: str) -> None:
with pytest.raises(BugNotFoundError):
reader.cat_blob_bytes('ff' * 20)
@@ -793,7 +837,9 @@ class TestCatBlobBytes:
# ------------------------------------------------------------------
class TestListBugRefsSince:
- def _create_bug_with_timestamp(self, repo_path, reader, ts):
+ def _create_bug_with_timestamp(
+ self, repo_path: str, reader: BugReader, ts: int,
+ ) -> None:
"""Helper: create a bug ref with a specific commit timestamp."""
repo = pygit2.Repository(repo_path)
sig = pygit2.Signature('Test', 'test@test.com',
@@ -810,17 +856,17 @@ class TestListBugRefsSince:
'refs/bugs/%s' % BUG_ID, sig, sig, 'op pack', tree_oid, [],
)
- def test_no_filter(self, reader, repo_path):
+ def test_no_filter(self, reader: BugReader, repo_path: str) -> None:
self._create_bug_with_timestamp(repo_path, reader, 1700005000)
refs = reader.list_bug_refs()
assert len(refs) == 1
- def test_since_includes_newer(self, reader, repo_path):
+ def test_since_includes_newer(self, reader: BugReader, repo_path: str) -> None:
self._create_bug_with_timestamp(repo_path, reader, 1700005000)
refs = reader.list_bug_refs(since=1700000000)
assert len(refs) == 1
- def test_since_excludes_older(self, reader, repo_path):
+ def test_since_excludes_older(self, reader: BugReader, repo_path: str) -> None:
self._create_bug_with_timestamp(repo_path, reader, 1700005000)
refs = reader.list_bug_refs(since=1700010000)
assert len(refs) == 0
diff --git a/tests/test_integration.py b/tests/test_integration.py
index 8a71bb8..dcbbc6c 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -7,10 +7,12 @@ Skip automatically when ``git-bug`` is not installed.
import json
import shutil
import subprocess
+from pathlib import Path
import pytest
from ezgb import GitBugRepo, Status
+from ezgb._types import JsonValue
pytestmark = pytest.mark.skipif(
shutil.which('git-bug') is None,
@@ -19,15 +21,15 @@ pytestmark = pytest.mark.skipif(
@pytest.fixture()
-def gb_repo(tmp_path):
+def gb_repo(tmp_path: Path) -> GitBugRepo:
"""Spin up a temporary git repo with git-bug and a test identity."""
repo_dir = tmp_path / 'repo'
repo_dir.mkdir()
repo_path = str(repo_dir)
- def _run(args, **kwargs):
+ def _run(args: list[str]) -> subprocess.CompletedProcess[str]:
return subprocess.run(
- args, capture_output=True, text=True, check=True, **kwargs,
+ args, capture_output=True, text=True, check=True,
)
# Initialise the git repo
@@ -42,8 +44,13 @@ def gb_repo(tmp_path):
'-n', 'Test User', '-e', 'test@example.com',
'--non-interactive'])
result = _run(['git', '-C', repo_path, 'bug', 'user', '-f', 'json'])
- users = json.loads(result.stdout)
- _run(['git', '-C', repo_path, 'bug', 'user', 'adopt', users[0]['id']])
+ users: JsonValue = json.loads(result.stdout)
+ assert isinstance(users, list)
+ user = users[0]
+ assert isinstance(user, dict)
+ user_id = user['id']
+ assert isinstance(user_id, str)
+ _run(['git', '-C', repo_path, 'bug', 'user', 'adopt', user_id])
return GitBugRepo(repo_path)
@@ -53,7 +60,7 @@ def gb_repo(tmp_path):
# ------------------------------------------------------------------
class TestCreateAndRead:
- def test_round_trip(self, gb_repo):
+ def test_round_trip(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Test bug', 'Description text')
assert bug.title == 'Test bug'
assert bug.status == Status.OPEN
@@ -69,7 +76,7 @@ class TestCreateAndRead:
assert bug2.id == bug.id
assert bug2.title == 'Test bug'
- def test_resolve_by_prefix(self, gb_repo):
+ def test_resolve_by_prefix(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Prefix test', 'Body')
prefix = bug.id[:8]
full_id = gb_repo.resolve_bug_id(prefix)
@@ -77,7 +84,7 @@ class TestCreateAndRead:
class TestComments:
- def test_add_comment(self, gb_repo):
+ def test_add_comment(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Comment test', 'Original body')
comment = gb_repo.add_comment(bug.id, 'Follow-up')
assert comment.text == 'Follow-up'
@@ -88,7 +95,7 @@ class TestComments:
assert bug.comments[0].text == 'Original body'
assert bug.comments[1].text == 'Follow-up'
- def test_multiple_comments_ordering(self, gb_repo):
+ def test_multiple_comments_ordering(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Ordering test', 'c0')
gb_repo.add_comment(bug.id, 'c1')
gb_repo.add_comment(bug.id, 'c2')
@@ -102,7 +109,7 @@ class TestComments:
class TestEditComment:
- def test_edit_comment_text(self, gb_repo):
+ def test_edit_comment_text(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Edit comment test', 'Original body')
comment = gb_repo.add_comment(bug.id, 'Original follow-up')
@@ -111,7 +118,7 @@ class TestEditComment:
assert len(bug.comments) == 2
assert bug.comments[1].text == 'Edited follow-up'
- def test_edit_preserves_other_comments(self, gb_repo):
+ def test_edit_preserves_other_comments(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Preserve test', 'c0')
c1 = gb_repo.add_comment(bug.id, 'c1')
gb_repo.add_comment(bug.id, 'c2')
@@ -121,7 +128,7 @@ class TestEditComment:
texts = [c.text for c in bug.comments]
assert texts == ['c0', 'c1-edited', 'c2']
- def test_edit_to_tombstone(self, gb_repo):
+ def test_edit_to_tombstone(self, gb_repo: GitBugRepo) -> None:
"""Simulate the b4 bugs comment removal flow."""
bug = gb_repo.create_bug('Tombstone test', 'Body')
comment = gb_repo.add_comment(bug.id, 'Sensitive content')
@@ -137,7 +144,7 @@ class TestEditComment:
class TestStatus:
- def test_close_and_reopen(self, gb_repo):
+ def test_close_and_reopen(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Status test', 'Body')
assert gb_repo.get_bug(bug.id).status == Status.OPEN
@@ -151,7 +158,7 @@ class TestStatus:
class TestTitle:
- def test_edit_title(self, gb_repo):
+ def test_edit_title(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Original title', 'Body')
gb_repo.set_title(bug.id, 'Updated title')
@@ -160,7 +167,7 @@ class TestTitle:
class TestLabels:
- def test_add_and_remove(self, gb_repo):
+ def test_add_and_remove(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Label test', 'Body')
gb_repo.add_label(bug.id, 'priority/high')
gb_repo.add_label(bug.id, 'area/network')
@@ -176,7 +183,7 @@ class TestLabels:
class TestListBugs:
- def test_list_all(self, gb_repo):
+ def test_list_all(self, gb_repo: GitBugRepo) -> None:
gb_repo.create_bug('Bug one', 'First')
gb_repo.create_bug('Bug two', 'Second')
@@ -185,7 +192,7 @@ class TestListBugs:
titles = {b.title for b in bugs}
assert titles == {'Bug one', 'Bug two'}
- def test_filter_by_status(self, gb_repo):
+ def test_filter_by_status(self, gb_repo: GitBugRepo) -> None:
gb_repo.create_bug('Open bug', 'Body')
closed = gb_repo.create_bug('Closed bug', 'Body')
gb_repo.set_status(closed.id, Status.CLOSED)
@@ -199,7 +206,7 @@ class TestListBugs:
assert len(closed_bugs) == 1
assert closed_bugs[0].title == 'Closed bug'
- def test_filter_by_label(self, gb_repo):
+ def test_filter_by_label(self, gb_repo: GitBugRepo) -> None:
labeled = gb_repo.create_bug('Labeled', 'Body')
gb_repo.create_bug('Unlabeled', 'Body')
gb_repo.add_label(labeled.id, 'important')
@@ -211,7 +218,7 @@ class TestListBugs:
class TestIdentities:
- def test_list_identities(self, gb_repo):
+ def test_list_identities(self, gb_repo: GitBugRepo) -> None:
identities = gb_repo.list_identities()
assert len(identities) >= 1
names = [i.name for i in identities]
@@ -221,7 +228,7 @@ class TestIdentities:
class TestIterBugs:
- def test_yields_same_as_list(self, gb_repo):
+ def test_yields_same_as_list(self, gb_repo: GitBugRepo) -> None:
gb_repo.create_bug('Bug A', 'Body A')
gb_repo.create_bug('Bug B', 'Body B')
@@ -233,7 +240,7 @@ class TestIterBugs:
assert len(listed) == len(iterated) == 2
assert {b.title for b in listed} == {b.title for b in iterated}
- def test_iter_with_filter(self, gb_repo):
+ def test_iter_with_filter(self, gb_repo: GitBugRepo) -> None:
gb_repo.create_bug('Open one', 'Body')
closed = gb_repo.create_bug('Closed one', 'Body')
gb_repo.set_status(closed.id, Status.CLOSED)
@@ -245,7 +252,7 @@ class TestIterBugs:
class TestSinceFilter:
- def test_list_bugs_since(self, gb_repo):
+ def test_list_bugs_since(self, gb_repo: GitBugRepo) -> None:
"""Bugs created before 'since' are excluded."""
bug = gb_repo.create_bug('Recent bug', 'Body')
# Use a timestamp far in the past -- should include the bug
@@ -257,7 +264,7 @@ class TestSinceFilter:
bugs = gb_repo.list_bugs(since=9999999999)
assert len(bugs) == 0
- def test_since_with_iso_string(self, gb_repo):
+ def test_since_with_iso_string(self, gb_repo: GitBugRepo) -> None:
gb_repo.create_bug('String since', 'Body')
gb_repo.invalidate()
bugs = gb_repo.list_bugs(since='2020-01-01 00:00:00')
@@ -265,7 +272,7 @@ class TestSinceFilter:
class TestAttachments:
- def test_get_attachment_round_trip(self, gb_repo):
+ def test_get_attachment_round_trip(self, gb_repo: GitBugRepo) -> None:
"""Create a bug with an attachment, then read it back."""
# Create a bug -- its description becomes comment 0
bug = gb_repo.create_bug('Attachment test', 'See attached')
@@ -289,7 +296,7 @@ class TestAttachments:
class TestCache:
- def test_invalidate_and_reread(self, gb_repo):
+ def test_invalidate_and_reread(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Cache test', 'Body')
bug1 = gb_repo.get_bug(bug.id)
gb_repo.invalidate(bug.id)
@@ -298,7 +305,7 @@ class TestCache:
assert bug1.title == bug2.title
assert bug1.id == bug2.id
- def test_full_invalidate(self, gb_repo):
+ def test_full_invalidate(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Full invalidate', 'Body')
gb_repo.get_bug(bug.id)
gb_repo.invalidate()
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH ezgb 3/6] Add Ruff format check
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 1/6] Add local CI script Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 2/6] Add mypy checks Tamir Duberstein
@ 2026-04-20 4:39 ` Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 4/6] Add pyright checks Tamir Duberstein
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Configure Ruff formatting to preserve the repository's single-quote
style and add the format check to local CI.
Apply the formatter once so the new check starts green.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
ci.sh | 1 +
pyproject.toml | 3 +
src/ezgb/__init__.py | 74 ++++++++++----------
src/ezgb/_git.py | 4 +-
src/ezgb/_models.py | 9 +++
src/ezgb/_reader.py | 55 ++++++++++-----
src/ezgb/_types.py | 1 +
src/ezgb/_writer.py | 27 +++++---
tests/conftest.py | 62 ++++++++++++-----
tests/test_ezgb.py | 169 ++++++++++++++++++++++++++++++----------------
tests/test_integration.py | 32 +++++++--
11 files changed, 290 insertions(+), 147 deletions(-)
diff --git a/ci.sh b/ci.sh
index 3001db2..db7914f 100755
--- a/ci.sh
+++ b/ci.sh
@@ -3,5 +3,6 @@
set -eu
uv run ruff check
+uv run ruff format --check
uv run mypy .
uv run pytest --durations=0
diff --git a/pyproject.toml b/pyproject.toml
index aeae989..c043817 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -47,3 +47,6 @@ strict = true
[tool.ruff.lint]
select = ["E", "F", "W", "I"]
+
+[tool.ruff.format]
+quote-style = "single"
diff --git a/src/ezgb/__init__.py b/src/ezgb/__init__.py
index f60d63e..5cb23ae 100644
--- a/src/ezgb/__init__.py
+++ b/src/ezgb/__init__.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2024 by the Linux Foundation
"""ezgb: a standalone Python library for git-bug repositories."""
+
from __future__ import annotations
from collections.abc import Iterator
@@ -77,6 +78,7 @@ class GitBugRepo:
return int(since.timestamp())
# str -- delegate to the reader's parser
from ezgb._reader import BugReader
+
return BugReader._parse_since(since)
def list_bugs(
@@ -94,9 +96,13 @@ class GitBugRepo:
``YYYYMMDDHHMMSS`` format. Only bugs whose tip commit is
newer than this value are returned.
"""
- return list(self.iter_bugs(
- status=status, label=label, since=since,
- ))
+ return list(
+ self.iter_bugs(
+ status=status,
+ label=label,
+ since=since,
+ )
+ )
def iter_bugs(
self,
@@ -143,16 +149,18 @@ class GitBugRepo:
if cached is not None:
results = cached
if status is not None:
- results = [s for s in results
- if s.status == status]
+ results = [s for s in results if s.status == status]
if label is not None:
- results = [s for s in results
- if label in s.labels]
+ results = [s for s in results if label in s.labels]
return results
# Slow path: native git object reads
- return list(self.iter_bug_summaries(
- status=status, label=label, since=since,
- ))
+ return list(
+ self.iter_bug_summaries(
+ status=status,
+ label=label,
+ since=since,
+ )
+ )
def _list_summaries_from_cli(self) -> list[BugSummary] | None:
"""Try to list summaries via the git-bug CLI cache.
@@ -167,8 +175,8 @@ class GitBugRepo:
return None
from ezgb._git import git_bug_cli
- ecode, out, _err = git_bug_cli(
- self._repo, ['bug', '-f', 'json'])
+
+ ecode, out, _err = git_bug_cli(self._repo, ['bug', '-f', 'json'])
if ecode != 0 or not out.strip():
return None
try:
@@ -183,24 +191,19 @@ class GitBugRepo:
if not bid:
continue
status_str = str(raw.get('status', 'open'))
- bug_status = (Status.CLOSED if status_str == 'closed'
- else Status.OPEN)
+ bug_status = Status.CLOSED if status_str == 'closed' else Status.OPEN
create_time = raw.get('create_time') or {}
edit_time = raw.get('edit_time') or {}
- ct = (create_time.get('timestamp', 0)
- if isinstance(create_time, dict) else 0)
- et = (edit_time.get('timestamp', 0)
- if isinstance(edit_time, dict) else 0)
+ ct = create_time.get('timestamp', 0) if isinstance(create_time, dict) else 0
+ et = edit_time.get('timestamp', 0) if isinstance(edit_time, dict) else 0
if not isinstance(ct, (bool, int, float, str)):
ct = 0
if not isinstance(et, (bool, int, float, str)):
et = 0
author = raw.get('author') or {}
- author_name = (author.get('name', '')
- if isinstance(author, dict) else '')
+ author_name = author.get('name', '') if isinstance(author, dict) else ''
assert isinstance(author_name, str)
- author_id = (author.get('id', '')
- if isinstance(author, dict) else '')
+ author_id = author.get('id', '') if isinstance(author, dict) else ''
raw_labels = raw.get('labels') or []
if isinstance(raw_labels, list):
labels = frozenset(str(lb) for lb in raw_labels)
@@ -209,19 +212,19 @@ class GitBugRepo:
comment_count = raw.get('comments', 0)
if not isinstance(comment_count, int):
comment_count = 0
- results.append(BugSummary(
- id=bid,
- title=str(raw.get('title', '')),
- status=bug_status,
- creator_id=str(author_id),
- created_at=datetime.fromtimestamp(
- int(ct), tz=timezone.utc),
- labels=labels,
- comment_count=comment_count,
- author_name=author_name,
- edited_at=datetime.fromtimestamp(
- int(et), tz=timezone.utc),
- ))
+ results.append(
+ BugSummary(
+ id=bid,
+ title=str(raw.get('title', '')),
+ status=bug_status,
+ creator_id=str(author_id),
+ created_at=datetime.fromtimestamp(int(ct), tz=timezone.utc),
+ labels=labels,
+ comment_count=comment_count,
+ author_name=author_name,
+ edited_at=datetime.fromtimestamp(int(et), tz=timezone.utc),
+ )
+ )
return results
def iter_bug_summaries(
@@ -269,6 +272,7 @@ class GitBugRepo:
import json
from ezgb._git import git_bug_cli
+
ecode, out, _err = git_bug_cli(self._repo, ['bug', '-f', 'json', query])
if ecode != 0:
return []
diff --git a/src/ezgb/_git.py b/src/ezgb/_git.py
index c09b066..4e29646 100644
--- a/src/ezgb/_git.py
+++ b/src/ezgb/_git.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2024 by the Linux Foundation
"""Thin git subprocess helpers for ezgb."""
+
from __future__ import annotations
import os
@@ -51,7 +52,8 @@ def git_lines(repo_path: str, args: list[str]) -> list[str]:
def git_bug_cli(
- repo_path: str, args: list[str],
+ repo_path: str,
+ args: list[str],
stdin: str | None = None,
) -> tuple[int, str, str]:
"""Run ``git -C REPO bug <args>`` for write operations.
diff --git a/src/ezgb/_models.py b/src/ezgb/_models.py
index 144a7ee..b8716f0 100644
--- a/src/ezgb/_models.py
+++ b/src/ezgb/_models.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2024 by the Linux Foundation
"""Data models, enums, exceptions, and constants for ezgb."""
+
from __future__ import annotations
import enum
@@ -13,6 +14,7 @@ _EPOCH_UTC = datetime.min.replace(tzinfo=timezone.utc)
# -- Exceptions --------------------------------------------------------------
+
class EzgbError(Exception):
"""Base exception for all ezgb errors."""
@@ -43,8 +45,10 @@ class CliError(EzgbError):
# -- Enums -------------------------------------------------------------------
+
class Status(enum.Enum):
"""Bug status matching git-bug's common.Status values."""
+
OPEN = 1
CLOSED = 2
@@ -72,9 +76,11 @@ STATUS_CLOSED: int = 2
# -- Dataclasses -------------------------------------------------------------
+
@dataclass(frozen=True)
class Identity:
"""A git-bug user identity."""
+
id: str
name: str
email: str
@@ -84,6 +90,7 @@ class Identity:
@dataclass
class Comment:
"""A comment on a bug."""
+
id: str
author: Identity
text: str
@@ -95,6 +102,7 @@ class Comment:
@dataclass
class Bug:
"""A git-bug bug snapshot reconstructed from operations."""
+
id: str
title: str
status: Status
@@ -117,6 +125,7 @@ class BugSummary:
*edited_at* are available. When built from native git objects,
these may be empty/epoch if identity resolution was skipped.
"""
+
id: str
title: str
status: Status
diff --git a/src/ezgb/_reader.py b/src/ezgb/_reader.py
index dac4a8c..735d41d 100644
--- a/src/ezgb/_reader.py
+++ b/src/ezgb/_reader.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2024 by the Linux Foundation
"""Git object reading, operation pack replay, and caching for ezgb."""
+
from __future__ import annotations
import hashlib
@@ -47,12 +48,15 @@ _K = TypeVar('_K')
_T = TypeVar('_T')
_U = TypeVar('_U')
+
def _is_list(value: list[_T], item_ty: type[_U]) -> TypeGuard[list[_U]]:
return all(isinstance(item, item_ty) for item in value)
+
def _is_dict_values(value: dict[_K, _T], value_ty: type[_U]) -> TypeGuard[dict[_K, _U]]:
return all(isinstance(value, value_ty) for value in value.values())
+
def _combine_ids(primary: str, secondary: str) -> str:
"""Interleave primary and secondary IDs into a CombinedId.
@@ -75,6 +79,7 @@ def _combine_ids(primary: str, secondary: str) -> str:
pi += 1
return ''.join(result)
+
class BugReader:
"""Reads bug and identity data from git-bug's git object storage."""
@@ -113,7 +118,9 @@ class BugReader:
return bytes(obj.data)
def _walk_ref_tree_blobs(
- self, refname: str, target_file: str = 'ops',
+ self,
+ refname: str,
+ target_file: str = 'ops',
) -> list[tuple[str, str]]:
"""Walk the commit chain for a ref and find named blobs.
@@ -142,7 +149,9 @@ class BugReader:
@staticmethod
def _check_format_version_tree(
- tree: pygit2.Tree, prefix: str, supported: int,
+ tree: pygit2.Tree,
+ prefix: str,
+ supported: int,
) -> None:
"""Validate the git-bug format version from a commit tree.
@@ -153,7 +162,7 @@ class BugReader:
name: str = entry.name or ''
if name.startswith(prefix):
try:
- version = int(name[len(prefix):])
+ version = int(name[len(prefix) :])
except ValueError:
continue
if version != supported:
@@ -166,7 +175,10 @@ class BugReader:
# -- Ref enumeration -----------------------------------------------------
def _list_refs(
- self, prefix: str, *, since: int = 0,
+ self,
+ prefix: str,
+ *,
+ since: int = 0,
) -> list[tuple[str, str]]:
"""Return ``[(entity_id, commit_hex)]`` for refs under *prefix*.
@@ -188,7 +200,9 @@ class BugReader:
return results
def list_bug_refs(
- self, *, since: int = 0,
+ self,
+ *,
+ since: int = 0,
) -> list[tuple[str, str]]:
"""Return ``[(bug_id, commit_hash)]`` for all bugs."""
return self._list_refs('refs/bugs/', since=since)
@@ -227,7 +241,8 @@ class BugReader:
# -- Operation pack parsing ----------------------------------------------
def _get_op_packs(
- self, bid: str,
+ self,
+ bid: str,
) -> tuple[list[_JsonObject], list[str]]:
"""Walk the commit chain for a bug and return operation packs
(oldest first) together with the raw blob strings.
@@ -246,8 +261,7 @@ class BugReader:
ref = self._pygit.references.get(refname)
if ref is not None:
tip = ref.peel(pygit2.Commit)
- self._check_format_version_tree(
- tip.tree, 'version-', SUPPORTED_BUG_FORMAT)
+ self._check_format_version_tree(tip.tree, 'version-', SUPPORTED_BUG_FORMAT)
packs: list[_JsonObject] = []
raw_blobs: list[str] = []
for _commit, blob_hash in entries:
@@ -257,7 +271,8 @@ class BugReader:
except json.JSONDecodeError:
logger.warning(
'failed to parse ops blob %s for bug %s',
- blob_hash, bid,
+ blob_hash,
+ bid,
)
continue
assert isinstance(pack, dict)
@@ -277,7 +292,9 @@ class BugReader:
return self._identity_cache[identity_id]
fallback = Identity(
- id=identity_id, name=identity_id, email=identity_id,
+ id=identity_id,
+ name=identity_id,
+ email=identity_id,
)
refname = 'refs/identities/' + identity_id
try:
@@ -417,7 +434,8 @@ class BugReader:
raise ValueError('cannot parse since=%s' % since)
def build_bug(
- self, bid: str,
+ self,
+ bid: str,
packs: list[_JsonObject] | None = None,
raw_blobs: list[str] | None = None,
) -> Bug:
@@ -457,8 +475,9 @@ class BugReader:
assert isinstance(author_value, dict)
author_id = author_value.get('id', '')
assert isinstance(author_id, str)
- raw_ops = (raw_ops_per_pack[pack_idx]
- if pack_idx < len(raw_ops_per_pack) else [])
+ raw_ops = (
+ raw_ops_per_pack[pack_idx] if pack_idx < len(raw_ops_per_pack) else []
+ )
ops = pack.get('ops', [])
assert isinstance(ops, list)
for op_idx, op in enumerate(ops):
@@ -467,8 +486,7 @@ class BugReader:
assert isinstance(op_type, int)
timestamp = op.get('timestamp', 0)
assert isinstance(timestamp, int)
- raw_json = (raw_ops[op_idx]
- if op_idx < len(raw_ops) else '')
+ raw_json = raw_ops[op_idx] if op_idx < len(raw_ops) else ''
op_id = self._op_hash(raw_json) if raw_json else ''
if op_type == OP_CREATE:
@@ -530,7 +548,7 @@ class BugReader:
elif op_type == OP_SET_STATUS:
status_val = op.get('status', STATUS_OPEN)
assert isinstance(status_val, int)
- is_open = (status_val == STATUS_OPEN)
+ is_open = status_val == STATUS_OPEN
elif op_type == OP_LABEL_CHANGE:
added = op.get('added', [])
@@ -588,7 +606,8 @@ class BugReader:
return bug
def build_bug_summary(
- self, bid: str,
+ self,
+ bid: str,
packs: list[_JsonObject] | None = None,
) -> BugSummary:
"""Build a lightweight bug summary by replaying operation packs.
@@ -649,7 +668,7 @@ class BugReader:
elif op_type == OP_SET_STATUS:
status_val = op.get('status', STATUS_OPEN)
assert isinstance(status_val, int)
- is_open = (status_val == STATUS_OPEN)
+ is_open = status_val == STATUS_OPEN
elif op_type == OP_LABEL_CHANGE:
added = op.get('added', [])
diff --git a/src/ezgb/_types.py b/src/ezgb/_types.py
index e3e46da..389b743 100644
--- a/src/ezgb/_types.py
+++ b/src/ezgb/_types.py
@@ -1,4 +1,5 @@
"""Internal type aliases."""
+
from __future__ import annotations
from typing import Dict, List, Union
diff --git a/src/ezgb/_writer.py b/src/ezgb/_writer.py
index 8888a04..ae1d45f 100644
--- a/src/ezgb/_writer.py
+++ b/src/ezgb/_writer.py
@@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2024 by the Linux Foundation
"""CLI wrappers for git-bug write operations."""
+
from __future__ import annotations
import logging
@@ -35,8 +36,7 @@ class BugWriter:
self._repo = repo_path
self._reader = reader
- def _cli(self, args: list[str],
- stdin: str | None = None) -> tuple[int, str, str]:
+ def _cli(self, args: list[str], stdin: str | None = None) -> tuple[int, str, str]:
"""Run a git-bug CLI command."""
return git_bug_cli(self._repo, args, stdin=stdin)
@@ -58,9 +58,7 @@ class BugWriter:
# Parse human_id from output like "abc1234 created"
match = _NEW_BUG_RE.match(out.strip())
if not match:
- raise CliError(
- 'could not parse bug ID from git bug new output: %s' % out
- )
+ raise CliError('could not parse bug ID from git bug new output: %s' % out)
human_id = match.group(1)
self._reader.invalidate()
@@ -71,8 +69,13 @@ class BugWriter:
"""Add a comment to a bug and return the new Comment."""
bid = self._reader.resolve_bug_id(bid)
args = [
- 'bug', 'comment', 'new', bid,
- '-F', '-', '--non-interactive',
+ 'bug',
+ 'comment',
+ 'new',
+ bid,
+ '-F',
+ '-',
+ '--non-interactive',
]
ecode, out, err = self._cli(args, stdin=text)
if ecode != 0:
@@ -89,8 +92,13 @@ class BugWriter:
"""
bid = self._reader.resolve_bug_id(bid)
args = [
- 'bug', 'comment', 'edit', comment_id,
- '-F', '-', '--non-interactive',
+ 'bug',
+ 'comment',
+ 'edit',
+ comment_id,
+ '-F',
+ '-',
+ '--non-interactive',
]
ecode, out, err = self._cli(args, stdin=text)
if ecode != 0:
@@ -166,4 +174,3 @@ class BugWriter:
invalidate caches after a successful pull.
"""
return self._cli(['pull', remote])
-
diff --git a/tests/conftest.py b/tests/conftest.py
index ed03529..75e3b95 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -3,6 +3,7 @@
Creates real git objects in temporary bare repos using pygit2 so
the BugReader can read them without subprocess mocking.
"""
+
from __future__ import annotations
import json
@@ -31,23 +32,28 @@ CliResult = tuple[int, str, str]
# -- Test data factories -----------------------------------------------------
+
def make_identity_version(name: str, email: str) -> str:
"""Build a JSON identity version blob (format 2)."""
- return json.dumps({
- 'version': 2,
- 'unix_time': 1700000000,
- 'name': name,
- 'email': email,
- 'login': email.split('@')[0],
- })
+ return json.dumps(
+ {
+ 'version': 2,
+ 'unix_time': 1700000000,
+ 'name': name,
+ 'email': email,
+ 'login': email.split('@')[0],
+ }
+ )
def make_op_pack(author_id: str, ops: list[JsonObject]) -> str:
"""Build a JSON operation pack with author and ops array."""
- return json.dumps({
- 'author': {'id': author_id},
- 'ops': ops,
- })
+ return json.dumps(
+ {
+ 'author': {'id': author_id},
+ 'ops': ops,
+ }
+ )
def make_create_op(
@@ -101,8 +107,10 @@ def make_edit_comment_op(
) -> JsonObject:
"""Build an OP_EDIT_COMMENT (type 6) operation."""
return {
- 'type': 6, 'timestamp': timestamp,
- 'target': target, 'message': message,
+ 'type': 6,
+ 'timestamp': timestamp,
+ 'target': target,
+ 'message': message,
}
@@ -117,10 +125,12 @@ def make_label_change_op(
if removed is None:
removed = []
return {
- 'type': 5, 'timestamp': timestamp,
+ 'type': 5,
+ 'timestamp': timestamp,
# Shallow copies are needed because list is invariant. We could use
# Sequence instead, but that's fancy for little benefit.
- 'added': [a for a in added], 'removed': [r for r in removed],
+ 'added': [a for a in added],
+ 'removed': [r for r in removed],
}
@@ -139,6 +149,7 @@ def make_noop_op(timestamp: int = 1700006000) -> JsonObject:
# -- Real git object helpers -------------------------------------------------
+
def _create_bug_commit(
repo: pygit2.Repository,
refname: str,
@@ -161,7 +172,12 @@ def _create_bug_commit(
parents = [parent_oid] if parent_oid else []
return repo.create_commit(
- refname, _SIG, _SIG, 'op pack', tree_oid, parents,
+ refname,
+ _SIG,
+ _SIG,
+ 'op pack',
+ tree_oid,
+ parents,
)
@@ -181,12 +197,18 @@ def _create_identity_commit(
tree_oid = tb.write()
return repo.create_commit(
- refname, _SIG, _SIG, 'identity', tree_oid, [],
+ refname,
+ _SIG,
+ _SIG,
+ 'identity',
+ tree_oid,
+ [],
)
# -- Convenience setup -------------------------------------------------------
+
def setup_identity(
repo_path: str,
identity_id: str,
@@ -236,7 +258,10 @@ def setup_single_bug(
if extra_packs:
for extra_json in extra_packs:
parent = _create_bug_commit(
- repo, refname, extra_json, parent_oid=parent,
+ repo,
+ refname,
+ extra_json,
+ parent_oid=parent,
)
# Pre-cache bug ID resolution so tests don't need separate
@@ -249,6 +274,7 @@ def setup_single_bug(
# -- Fixtures ----------------------------------------------------------------
+
class RecordingBugWriter(BugWriter):
"""BugWriter test double that records CLI calls and canned responses."""
diff --git a/tests/test_ezgb.py b/tests/test_ezgb.py
index 6d9f491..c36a454 100644
--- a/tests/test_ezgb.py
+++ b/tests/test_ezgb.py
@@ -6,6 +6,7 @@ writer (CLI-based mutations), and GitBugRepo facade.
Uses real git objects in temporary bare repos (via pygit2) instead
of subprocess mocking. See conftest.py for fixtures and helpers.
"""
+
import json
import pygit2
@@ -44,6 +45,7 @@ from ezgb._reader import BugReader, _combine_ids
# Unit tests: _combine_ids
# ------------------------------------------------------------------
+
class TestCombineIds:
"""Unit tests for the CombinedId interleaving function."""
@@ -72,6 +74,7 @@ class TestCombineIds:
# Bug ID resolution
# ------------------------------------------------------------------
+
class TestResolveBugId:
def test_resolves_full_id(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
@@ -117,6 +120,7 @@ class TestResolveBugId:
# Identity resolution
# ------------------------------------------------------------------
+
class TestResolveIdentity:
def test_resolves_by_id(self, reader: BugReader, repo_path: str) -> None:
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
@@ -139,11 +143,13 @@ class TestResolveIdentity:
def test_unsupported_format_raises(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
- identity_json = json.dumps({
- 'version': 99,
- 'name': 'Alice',
- 'email': 'alice@example.com',
- })
+ identity_json = json.dumps(
+ {
+ 'version': 99,
+ 'name': 'Alice',
+ 'email': 'alice@example.com',
+ }
+ )
refname = 'refs/identities/%s' % IDENTITY_ID
_create_identity_commit(repo, refname, identity_json)
with pytest.raises(UnsupportedFormatError, match='identity format'):
@@ -154,6 +160,7 @@ class TestResolveIdentity:
# Bug snapshot reconstruction
# ------------------------------------------------------------------
+
class TestBuildBug:
def test_snapshot_reconstruction(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
@@ -188,7 +195,8 @@ class TestBuildBug:
def test_label_add_and_remove(self, reader: BugReader, repo_path: str) -> None:
add_op = make_label_change_op(added=['bug', 'priority/high'])
rm_op = make_label_change_op(
- removed=['bug'], timestamp=1700005000,
+ removed=['bug'],
+ timestamp=1700005000,
)
setup_single_bug(repo_path, reader, extra_ops=[add_op, rm_op])
bug = reader.build_bug(BUG_ID)
@@ -206,16 +214,20 @@ class TestBuildBug:
assert bug.comments[1].text == 'A follow-up'
def test_comment_with_attachment(self, reader: BugReader, repo_path: str) -> None:
- ops: list[JsonObject] = [{
- 'type': 1,
- 'timestamp': 1700000000,
- 'title': 'Bug with file',
- 'message': 'See attached',
- 'files': ['blobhash123'],
- }]
+ ops: list[JsonObject] = [
+ {
+ 'type': 1,
+ 'timestamp': 1700000000,
+ 'title': 'Bug with file',
+ 'message': 'See attached',
+ 'files': ['blobhash123'],
+ }
+ ]
setup_single_bug(
- repo_path, reader,
- title='Bug with file', message='See attached',
+ repo_path,
+ reader,
+ title='Bug with file',
+ message='See attached',
extra_ops=None,
)
# Rebuild with custom ops containing files
@@ -242,7 +254,8 @@ class TestBuildBug:
target_hash = BugReader._op_hash(raw_ops[0])
edit_op = make_edit_comment_op(
- target=target_hash, message='Edited text',
+ target=target_hash,
+ message='Edited text',
)
# Build the full pack with both ops
ops = [create_op, edit_op]
@@ -250,7 +263,9 @@ class TestBuildBug:
repo = pygit2.Repository(repo_path)
_create_bug_commit(
- repo, 'refs/bugs/%s' % BUG_ID, full_pack_json,
+ repo,
+ 'refs/bugs/%s' % BUG_ID,
+ full_pack_json,
)
reader._resolve_cache[BUG_ID] = BUG_ID
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
@@ -259,18 +274,23 @@ class TestBuildBug:
assert bug.comments[0].text == 'Edited text'
def test_edit_comment_unmatched_target(
- self, reader: BugReader, repo_path: str,
+ self,
+ reader: BugReader,
+ repo_path: str,
) -> None:
"""Unmatched OP_EDIT_COMMENT target leaves text unchanged."""
edit_op = make_edit_comment_op(
- target='nonexistent', message='Edited text',
+ target='nonexistent',
+ message='Edited text',
)
setup_single_bug(repo_path, reader, extra_ops=[edit_op])
bug = reader.build_bug(BUG_ID)
assert bug.comments[0].text == 'Bug description'
def test_metadata_from_set_metadata(
- self, reader: BugReader, repo_path: str,
+ self,
+ reader: BugReader,
+ repo_path: str,
) -> None:
meta_op = make_set_metadata_op({'key': 'value'})
setup_single_bug(repo_path, reader, extra_ops=[meta_op])
@@ -286,12 +306,17 @@ class TestBuildBug:
def test_multiple_op_packs(self, reader: BugReader, repo_path: str) -> None:
"""Operations spread across multiple commits are replayed
in order."""
- pack2_json = make_op_pack(IDENTITY_ID, [
- make_set_title_op('Updated'),
- ])
+ pack2_json = make_op_pack(
+ IDENTITY_ID,
+ [
+ make_set_title_op('Updated'),
+ ],
+ )
setup_single_bug(
- repo_path, reader,
- title='Original', message='Body',
+ repo_path,
+ reader,
+ title='Original',
+ message='Body',
extra_packs=[pack2_json],
)
bug = reader.build_bug(BUG_ID)
@@ -310,11 +335,16 @@ class TestBuildBug:
def test_unsupported_format_raises(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
- ops_json = make_op_pack(IDENTITY_ID, [
- make_create_op('Test', 'body'),
- ])
+ ops_json = make_op_pack(
+ IDENTITY_ID,
+ [
+ make_create_op('Test', 'body'),
+ ],
+ )
_create_bug_commit(
- repo, 'refs/bugs/%s' % BUG_ID, ops_json,
+ repo,
+ 'refs/bugs/%s' % BUG_ID,
+ ops_json,
version_tag='version-99',
)
reader._resolve_cache[BUG_ID] = BUG_ID
@@ -326,6 +356,7 @@ class TestBuildBug:
# Bug summary (lightweight list-view snapshot)
# ------------------------------------------------------------------
+
class TestBuildBugSummary:
def test_basic(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
@@ -352,7 +383,8 @@ class TestBuildBugSummary:
def test_label_changes(self, reader: BugReader, repo_path: str) -> None:
add_op = make_label_change_op(added=['bug', 'priority/high'])
rm_op = make_label_change_op(
- removed=['bug'], timestamp=1700005000,
+ removed=['bug'],
+ timestamp=1700005000,
)
setup_single_bug(repo_path, reader, extra_ops=[add_op, rm_op])
s = reader.build_bug_summary(BUG_ID)
@@ -378,10 +410,13 @@ class TestBuildBugSummary:
assert s.comment_count == 0
def test_edit_comment_does_not_affect_count(
- self, reader: BugReader, repo_path: str,
+ self,
+ reader: BugReader,
+ repo_path: str,
) -> None:
edit_op = make_edit_comment_op(
- target='whatever', message='Edited',
+ target='whatever',
+ message='Edited',
)
setup_single_bug(repo_path, reader, extra_ops=[edit_op])
s = reader.build_bug_summary(BUG_ID)
@@ -434,6 +469,7 @@ class TestBuildBugSummary:
# Prefetch
# ------------------------------------------------------------------
+
class TestPrefetchBugs:
def test_warms_cache(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
@@ -458,6 +494,7 @@ class TestPrefetchBugs:
# Ref enumeration
# ------------------------------------------------------------------
+
class TestListBugRefs:
def test_returns_refs(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
@@ -482,6 +519,7 @@ class TestListIdentityRefs:
# Cache management
# ------------------------------------------------------------------
+
class TestInvalidate:
def test_invalidate_single_bug(self, reader: BugReader, repo_path: str) -> None:
setup_single_bug(repo_path, reader)
@@ -505,6 +543,7 @@ class TestInvalidate:
# Writer: create_bug
# ------------------------------------------------------------------
+
class TestCreateBug:
def test_creates_and_returns_bug(
self,
@@ -536,6 +575,7 @@ class TestCreateBug:
# Writer: add_comment
# ------------------------------------------------------------------
+
class TestAddComment:
def test_adds_and_returns_comment(
self,
@@ -558,7 +598,9 @@ class TestAddComment:
comment_op = make_comment_op('New comment', timestamp=1700005000)
pack_json = make_op_pack(IDENTITY_ID, [comment_op])
_create_bug_commit(
- repo, 'refs/bugs/%s' % BUG_ID, pack_json,
+ repo,
+ 'refs/bugs/%s' % BUG_ID,
+ pack_json,
parent_oid=parent.id,
)
@@ -571,6 +613,7 @@ class TestAddComment:
# Writer: set_status
# ------------------------------------------------------------------
+
class TestSetStatus:
def test_close(
self,
@@ -580,9 +623,7 @@ class TestSetStatus:
) -> None:
setup_single_bug(repo_path, reader)
writer.set_status(BUG_ID, Status.CLOSED)
- assert any(
- 'close' in ' '.join(c) for c in writer._cli_calls
- )
+ assert any('close' in ' '.join(c) for c in writer._cli_calls)
def test_open(
self,
@@ -592,15 +633,14 @@ class TestSetStatus:
) -> None:
setup_single_bug(repo_path, reader)
writer.set_status(BUG_ID, Status.OPEN)
- assert any(
- 'open' in ' '.join(c) for c in writer._cli_calls
- )
+ assert any('open' in ' '.join(c) for c in writer._cli_calls)
# ------------------------------------------------------------------
# Writer: set_title
# ------------------------------------------------------------------
+
class TestSetTitle:
def test_updates_title(
self,
@@ -610,15 +650,14 @@ class TestSetTitle:
) -> None:
setup_single_bug(repo_path, reader)
writer.set_title(BUG_ID, 'New title')
- assert any(
- 'New title' in ' '.join(c) for c in writer._cli_calls
- )
+ assert any('New title' in ' '.join(c) for c in writer._cli_calls)
# ------------------------------------------------------------------
# Writer: labels
# ------------------------------------------------------------------
+
class TestLabels:
def test_add_label(
self,
@@ -628,9 +667,7 @@ class TestLabels:
) -> None:
setup_single_bug(repo_path, reader)
writer.add_label(BUG_ID, 'priority/high')
- assert any(
- 'priority/high' in ' '.join(c) for c in writer._cli_calls
- )
+ assert any('priority/high' in ' '.join(c) for c in writer._cli_calls)
def test_remove_label(
self,
@@ -640,9 +677,7 @@ class TestLabels:
) -> None:
setup_single_bug(repo_path, reader)
writer.remove_label(BUG_ID, 'old-label')
- assert any(
- 'old-label' in ' '.join(c) for c in writer._cli_calls
- )
+ assert any('old-label' in ' '.join(c) for c in writer._cli_calls)
# ------------------------------------------------------------------
@@ -650,6 +685,7 @@ class TestLabels:
# GitBugRepo facade
# ------------------------------------------------------------------
+
class TestGitBugRepo:
def test_get_bug(self, repo_path: str) -> None:
repo_obj = GitBugRepo(repo_path)
@@ -764,8 +800,7 @@ class TestGitBugRepo:
repo_obj = GitBugRepo(repo_path)
# Create bug with a specific commit timestamp
repo = pygit2.Repository(repo_path)
- sig = pygit2.Signature('Test', 'test@test.com',
- time=1700005000, offset=0)
+ sig = pygit2.Signature('Test', 'test@test.com', time=1700005000, offset=0)
ops = [make_create_op('Test bug', 'Bug description')]
pack_json = make_op_pack(IDENTITY_ID, ops)
ops_blob = repo.create_blob(pack_json.encode())
@@ -775,7 +810,12 @@ class TestGitBugRepo:
tb.insert('version-4', version_blob, pygit2.GIT_FILEMODE_BLOB)
tree_oid = tb.write()
repo.create_commit(
- 'refs/bugs/%s' % BUG_ID, sig, sig, 'op pack', tree_oid, [],
+ 'refs/bugs/%s' % BUG_ID,
+ sig,
+ sig,
+ 'op pack',
+ tree_oid,
+ [],
)
repo_obj._reader._resolve_cache[BUG_ID] = BUG_ID
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
@@ -795,8 +835,7 @@ class TestGitBugRepo:
"""list_bugs(since='2023-11-14 ...') parses the string."""
repo_obj = GitBugRepo(repo_path)
repo = pygit2.Repository(repo_path)
- sig = pygit2.Signature('Test', 'test@test.com',
- time=1700005000, offset=0)
+ sig = pygit2.Signature('Test', 'test@test.com', time=1700005000, offset=0)
ops = [make_create_op('Test bug', 'Bug description')]
pack_json = make_op_pack(IDENTITY_ID, ops)
ops_blob = repo.create_blob(pack_json.encode())
@@ -806,7 +845,12 @@ class TestGitBugRepo:
tb.insert('version-4', version_blob, pygit2.GIT_FILEMODE_BLOB)
tree_oid = tb.write()
repo.create_commit(
- 'refs/bugs/%s' % BUG_ID, sig, sig, 'op pack', tree_oid, [],
+ 'refs/bugs/%s' % BUG_ID,
+ sig,
+ sig,
+ 'op pack',
+ tree_oid,
+ [],
)
repo_obj._reader._resolve_cache[BUG_ID] = BUG_ID
setup_identity(repo_path, IDENTITY_ID, 'Alice', 'alice@example.com')
@@ -819,6 +863,7 @@ class TestGitBugRepo:
# Attachment reading
# ------------------------------------------------------------------
+
class TestCatBlobBytes:
def test_reads_bytes(self, reader: BugReader, repo_path: str) -> None:
repo = pygit2.Repository(repo_path)
@@ -836,14 +881,17 @@ class TestCatBlobBytes:
# Since filtering on list_bug_refs
# ------------------------------------------------------------------
+
class TestListBugRefsSince:
def _create_bug_with_timestamp(
- self, repo_path: str, reader: BugReader, ts: int,
+ self,
+ repo_path: str,
+ reader: BugReader,
+ ts: int,
) -> None:
"""Helper: create a bug ref with a specific commit timestamp."""
repo = pygit2.Repository(repo_path)
- sig = pygit2.Signature('Test', 'test@test.com',
- time=ts, offset=0)
+ sig = pygit2.Signature('Test', 'test@test.com', time=ts, offset=0)
ops = [make_create_op('Test bug', 'description')]
pack_json = make_op_pack(IDENTITY_ID, ops)
ops_blob = repo.create_blob(pack_json.encode())
@@ -853,7 +901,12 @@ class TestListBugRefsSince:
tb.insert('version-4', version_blob, pygit2.GIT_FILEMODE_BLOB)
tree_oid = tb.write()
repo.create_commit(
- 'refs/bugs/%s' % BUG_ID, sig, sig, 'op pack', tree_oid, [],
+ 'refs/bugs/%s' % BUG_ID,
+ sig,
+ sig,
+ 'op pack',
+ tree_oid,
+ [],
)
def test_no_filter(self, reader: BugReader, repo_path: str) -> None:
diff --git a/tests/test_integration.py b/tests/test_integration.py
index dcbbc6c..963f635 100644
--- a/tests/test_integration.py
+++ b/tests/test_integration.py
@@ -4,6 +4,7 @@ These tests create ephemeral git repositories, initialize git-bug
with a test identity, and exercise the full ezgb stack end-to-end.
Skip automatically when ``git-bug`` is not installed.
"""
+
import json
import shutil
import subprocess
@@ -29,20 +30,34 @@ def gb_repo(tmp_path: Path) -> GitBugRepo:
def _run(args: list[str]) -> subprocess.CompletedProcess[str]:
return subprocess.run(
- args, capture_output=True, text=True, check=True,
+ args,
+ capture_output=True,
+ text=True,
+ check=True,
)
# Initialise the git repo
_run(['git', 'init', repo_path])
_run(['git', '-C', repo_path, 'config', 'user.name', 'Test User'])
- _run(['git', '-C', repo_path, 'config', 'user.email',
- 'test@example.com'])
+ _run(['git', '-C', repo_path, 'config', 'user.email', 'test@example.com'])
_run(['git', '-C', repo_path, 'commit', '--allow-empty', '-m', 'init'])
# Create and adopt a git-bug identity
- _run(['git', '-C', repo_path, 'bug', 'user', 'new',
- '-n', 'Test User', '-e', 'test@example.com',
- '--non-interactive'])
+ _run(
+ [
+ 'git',
+ '-C',
+ repo_path,
+ 'bug',
+ 'user',
+ 'new',
+ '-n',
+ 'Test User',
+ '-e',
+ 'test@example.com',
+ '--non-interactive',
+ ]
+ )
result = _run(['git', '-C', repo_path, 'bug', 'user', '-f', 'json'])
users: JsonValue = json.loads(result.stdout)
assert isinstance(users, list)
@@ -59,6 +74,7 @@ def gb_repo(tmp_path: Path) -> GitBugRepo:
# Tests
# ------------------------------------------------------------------
+
class TestCreateAndRead:
def test_round_trip(self, gb_repo: GitBugRepo) -> None:
bug = gb_repo.create_bug('Test bug', 'Description text')
@@ -283,11 +299,13 @@ class TestAttachments:
# blob. Use the ops blob itself as a stand-in.
# Instead, test against an actual blob by writing one via git.
import subprocess
+
repo_path = gb_repo._repo
result = subprocess.run(
['git', '-C', repo_path, 'hash-object', '-w', '--stdin'],
input=b'test file content',
- capture_output=True, check=True,
+ capture_output=True,
+ check=True,
)
blob_hash = result.stdout.decode().strip()
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH ezgb 4/6] Add pyright checks
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
` (2 preceding siblings ...)
2026-04-20 4:39 ` [PATCH ezgb 3/6] Add Ruff format check Tamir Duberstein
@ 2026-04-20 4:39 ` Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 5/6] Add ty checks Tamir Duberstein
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Add pyright to local CI with strict source checking.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
ci.sh | 1 +
pyproject.toml | 7 +++++++
src/ezgb/__init__.py | 8 +++-----
src/ezgb/_git.py | 2 +-
src/ezgb/_models.py | 4 ++--
src/ezgb/_reader.py | 38 +++++++++++++++++++++-----------------
src/ezgb/_writer.py | 14 +++++++-------
7 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/ci.sh b/ci.sh
index db7914f..fbc433d 100755
--- a/ci.sh
+++ b/ci.sh
@@ -5,4 +5,5 @@ set -eu
uv run ruff check
uv run ruff format --check
uv run mypy .
+uv run pyright
uv run pytest --durations=0
diff --git a/pyproject.toml b/pyproject.toml
index c043817..452bd6a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,6 +26,7 @@ classifiers = [
[dependency-groups]
dev = [
"mypy",
+ "pyright",
"pytest",
"ruff",
]
@@ -50,3 +51,9 @@ select = ["E", "F", "W", "I"]
[tool.ruff.format]
quote-style = "single"
+
+[tool.pyright]
+typeCheckingMode = "strict"
+executionEnvironments = [
+ { root = "tests", reportPrivateUsage = false },
+]
diff --git a/src/ezgb/__init__.py b/src/ezgb/__init__.py
index 5cb23ae..f2f5d3d 100644
--- a/src/ezgb/__init__.py
+++ b/src/ezgb/__init__.py
@@ -23,7 +23,7 @@ from ezgb._models import (
Status,
UnsupportedFormatError,
)
-from ezgb._reader import BugReader
+from ezgb._reader import BugReader, parse_since
from ezgb._types import JsonValue
from ezgb._writer import BugWriter
@@ -77,9 +77,7 @@ class GitBugRepo:
since = since.replace(tzinfo=timezone.utc)
return int(since.timestamp())
# str -- delegate to the reader's parser
- from ezgb._reader import BugReader
-
- return BugReader._parse_since(since)
+ return parse_since(since)
def list_bugs(
self,
@@ -206,7 +204,7 @@ class GitBugRepo:
author_id = author.get('id', '') if isinstance(author, dict) else ''
raw_labels = raw.get('labels') or []
if isinstance(raw_labels, list):
- labels = frozenset(str(lb) for lb in raw_labels)
+ labels: frozenset[str] = frozenset(str(lb) for lb in raw_labels)
else:
labels = frozenset()
comment_count = raw.get('comments', 0)
diff --git a/src/ezgb/_git.py b/src/ezgb/_git.py
index 4e29646..c1c326b 100644
--- a/src/ezgb/_git.py
+++ b/src/ezgb/_git.py
@@ -45,7 +45,7 @@ def git_run(
def git_lines(repo_path: str, args: list[str]) -> list[str]:
"""Run a git command and return non-empty output lines."""
- ecode, out = git_run(repo_path, args)
+ _ecode, out = git_run(repo_path, args)
if not isinstance(out, str):
out = out.decode(errors='replace')
return [line for line in out.split('\n') if line]
diff --git a/src/ezgb/_models.py b/src/ezgb/_models.py
index b8716f0..22e45a7 100644
--- a/src/ezgb/_models.py
+++ b/src/ezgb/_models.py
@@ -96,7 +96,7 @@ class Comment:
text: str
created_at: datetime
count: int
- attachment_ids: list[str] = field(default_factory=list)
+ attachment_ids: list[str] = field(default_factory=list[str])
@dataclass
@@ -110,7 +110,7 @@ class Bug:
created_at: datetime
labels: set[str]
comments: list[Comment]
- metadata: dict[str, str] = field(default_factory=dict)
+ metadata: dict[str, str] = field(default_factory=dict[str, str])
@dataclass(frozen=True)
diff --git a/src/ezgb/_reader.py b/src/ezgb/_reader.py
index 735d41d..2d44478 100644
--- a/src/ezgb/_reader.py
+++ b/src/ezgb/_reader.py
@@ -57,6 +57,26 @@ def _is_dict_values(value: dict[_K, _T], value_ty: type[_U]) -> TypeGuard[dict[_
return all(isinstance(value, value_ty) for value in value.values())
+def parse_since(since: str) -> int:
+ """Parse a datetime string to a unix timestamp.
+
+ Accepts ISO-8601 variants and ``YYYYMMDDHHMMSS``.
+ """
+ since = since.strip()
+ for fmt in (
+ '%Y-%m-%d %H:%M:%S',
+ '%Y%m%d%H%M%S',
+ '%Y-%m-%dT%H:%M:%SZ',
+ '%Y-%m-%dT%H:%M:%S',
+ ):
+ try:
+ dt = datetime.strptime(since, fmt).replace(tzinfo=timezone.utc)
+ return int(dt.timestamp())
+ except ValueError:
+ continue
+ raise ValueError('cannot parse since=%s' % since)
+
+
def _combine_ids(primary: str, secondary: str) -> str:
"""Interleave primary and secondary IDs into a CombinedId.
@@ -415,23 +435,7 @@ class BugReader:
@staticmethod
def _parse_since(since: str) -> int:
- """Parse a datetime string to a unix timestamp.
-
- Accepts ISO-8601 variants and ``YYYYMMDDHHMMSS``.
- """
- since = since.strip()
- for fmt in (
- '%Y-%m-%d %H:%M:%S',
- '%Y%m%d%H%M%S',
- '%Y-%m-%dT%H:%M:%SZ',
- '%Y-%m-%dT%H:%M:%S',
- ):
- try:
- dt = datetime.strptime(since, fmt).replace(tzinfo=timezone.utc)
- return int(dt.timestamp())
- except ValueError:
- continue
- raise ValueError('cannot parse since=%s' % since)
+ return parse_since(since)
def build_bug(
self,
diff --git a/src/ezgb/_writer.py b/src/ezgb/_writer.py
index ae1d45f..adacfa1 100644
--- a/src/ezgb/_writer.py
+++ b/src/ezgb/_writer.py
@@ -77,7 +77,7 @@ class BugWriter:
'-',
'--non-interactive',
]
- ecode, out, err = self._cli(args, stdin=text)
+ ecode, _out, err = self._cli(args, stdin=text)
if ecode != 0:
raise CliError('git bug comment new failed: %s' % err)
self._reader.invalidate(bid)
@@ -100,7 +100,7 @@ class BugWriter:
'-',
'--non-interactive',
]
- ecode, out, err = self._cli(args, stdin=text)
+ ecode, _out, err = self._cli(args, stdin=text)
if ecode != 0:
raise CliError('git bug comment edit failed: %s' % err)
self._reader.invalidate(bid)
@@ -112,7 +112,7 @@ class BugWriter:
subcmd = 'close'
else:
subcmd = 'open'
- ecode, out, err = self._cli(['bug', 'status', subcmd, bid])
+ ecode, _out, err = self._cli(['bug', 'status', subcmd, bid])
if ecode != 0:
raise CliError('git bug status %s failed: %s' % (subcmd, err))
self._reader.invalidate(bid)
@@ -121,7 +121,7 @@ class BugWriter:
"""Edit a bug's title."""
bid = self._reader.resolve_bug_id(bid)
args = ['bug', 'title', 'edit', bid, '-t', title]
- ecode, out, err = self._cli(args)
+ ecode, _out, err = self._cli(args)
if ecode != 0:
raise CliError('git bug title edit failed: %s' % err)
self._reader.invalidate(bid)
@@ -129,7 +129,7 @@ class BugWriter:
def add_label(self, bid: str, label: str) -> None:
"""Add a label to a bug."""
bid = self._reader.resolve_bug_id(bid)
- ecode, out, err = self._cli(
+ ecode, _out, err = self._cli(
['bug', 'label', 'new', bid, label],
)
if ecode != 0:
@@ -139,7 +139,7 @@ class BugWriter:
def remove_label(self, bid: str, label: str) -> None:
"""Remove a label from a bug."""
bid = self._reader.resolve_bug_id(bid)
- ecode, out, err = self._cli(
+ ecode, _out, err = self._cli(
['bug', 'label', 'rm', bid, label],
)
if ecode != 0:
@@ -153,7 +153,7 @@ class BugWriter:
remote copies. This is irreversible.
"""
bid = self._reader.resolve_bug_id(bid)
- ecode, out, err = self._cli(['bug', 'rm', bid])
+ ecode, _out, err = self._cli(['bug', 'rm', bid])
if ecode != 0:
raise CliError('git bug rm failed: %s' % err)
# Invalidate everything — the refs list has changed
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH ezgb 5/6] Add ty checks
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
` (3 preceding siblings ...)
2026-04-20 4:39 ` [PATCH ezgb 4/6] Add pyright checks Tamir Duberstein
@ 2026-04-20 4:39 ` Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 6/6] Document local CI checks Tamir Duberstein
2026-04-27 20:20 ` [PATCH ezgb 0/6] Harden " Tamir Duberstein
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Add ty to the local CI script with all rules set to errors.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
ci.sh | 1 +
pyproject.toml | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/ci.sh b/ci.sh
index fbc433d..e140eb6 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,6 +4,7 @@ set -eu
uv run ruff check
uv run ruff format --check
+uv run ty check
uv run mypy .
uv run pyright
uv run pytest --durations=0
diff --git a/pyproject.toml b/pyproject.toml
index 452bd6a..33a21d8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -29,6 +29,7 @@ dev = [
"pyright",
"pytest",
"ruff",
+ "ty",
]
[project.urls]
@@ -57,3 +58,6 @@ typeCheckingMode = "strict"
executionEnvironments = [
{ root = "tests", reportPrivateUsage = false },
]
+
+[tool.ty.rules]
+all = "error"
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH ezgb 6/6] Document local CI checks
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
` (4 preceding siblings ...)
2026-04-20 4:39 ` [PATCH ezgb 5/6] Add ty checks Tamir Duberstein
@ 2026-04-20 4:39 ` Tamir Duberstein
2026-04-27 20:20 ` [PATCH ezgb 0/6] Harden " Tamir Duberstein
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-20 4:39 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev, Tamir Duberstein
Replace the old pytest-only development instructions with the uv
workflow and the local CI script.
This keeps contributor documentation aligned with the checks used by
the branch.
Signed-off-by: Tamir Duberstein <tamird@kernel.org>
---
README.md | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index ce65d34..e4cbdf8 100644
--- a/README.md
+++ b/README.md
@@ -59,16 +59,17 @@ make -C docs html
Then open `docs/_build/html/index.html` in your browser.
-## Running tests
+## Development checks
```bash
-pip install -e '.[dev]'
-python -m pytest
+uv sync --all-groups
+./ci.sh
```
-The test suite includes unit tests (using real git objects in temporary
-repos via pygit2) and integration tests that exercise the full stack
-including the `git-bug` binary.
+The CI script runs Ruff, ty, mypy, pyright, and pytest. The test suite
+includes unit tests (using real git objects in temporary repos via
+pygit2) and integration tests that exercise the full stack including the
+`git-bug` binary.
## Contributing
--
2.53.0
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH ezgb 0/6] Harden local CI checks
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
` (5 preceding siblings ...)
2026-04-20 4:39 ` [PATCH ezgb 6/6] Document local CI checks Tamir Duberstein
@ 2026-04-27 20:20 ` Tamir Duberstein
6 siblings, 0 replies; 8+ messages in thread
From: Tamir Duberstein @ 2026-04-27 20:20 UTC (permalink / raw)
To: Kernel.org Tools; +Cc: Konstantin Ryabitsev
On Mon, Apr 20, 2026 at 12:39 AM Tamir Duberstein <tamird@kernel.org> wrote:
>
> Add a local CI script for ezgb and grow it from the checks that
> already pass to stricter formatting and type checking.
>
> The series removes stale pytest async configuration, adds Ruff
> formatting, mypy, pyright, and ty to local CI, and documents the
> uv-based development workflow.
>
> Signed-off-by: Tamir Duberstein <tamird@kernel.org>
Hi Konstantin, any interest in this series? I'm happy to make changes if needed.
Cheers.
Tamir
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-04-27 20:21 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-04-20 4:39 [PATCH ezgb 0/6] Harden local CI checks Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 1/6] Add local CI script Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 2/6] Add mypy checks Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 3/6] Add Ruff format check Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 4/6] Add pyright checks Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 5/6] Add ty checks Tamir Duberstein
2026-04-20 4:39 ` [PATCH ezgb 6/6] Document local CI checks Tamir Duberstein
2026-04-27 20:20 ` [PATCH ezgb 0/6] Harden " Tamir Duberstein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox