gitlab_mr_check 1.4.2__tar.gz → 1.5.0__tar.gz

{gitlab_mr_check-1.4.2 → gitlab_mr_check-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gitlab_mr_check
-Version: 1.4.2
+Version: 1.5.0
 Summary: GitLab Merge Request 4-Eyes Approval Audit Tool
 Author: Yorick Hoorneman
 Author-email: Yorick Hoorneman <yhoorneman@schubergphilis.com>

{gitlab_mr_check-1.4.2 → gitlab_mr_check-1.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "gitlab_mr_check"
-version = "1.4.2"
+version = "1.5.0"
 description = "GitLab Merge Request 4-Eyes Approval Audit Tool"
 readme = "README.md"
 authors = [
@@ -63,13 +63,13 @@ test = [
     # Pin uv to match [tool.uv] required-version — tox-uv depends on the uv
     # Python package, which installs a uv binary into .venv/bin that would
     # otherwise shadow the image's /usr/local/bin/uv and break the check.
-    "uv==0.11.7",
+    "uv==0.11.16",
     "tox>=4.21",
     "tox-uv>=1.16",
 ]
 
 [build-system]
-requires = ["uv_build>=0.8.15,<=0.11.7"]
+requires = ["uv_build>=0.8.15,<=0.11.16"]
 build-backend = "uv_build"
 
 [tool.pyscn.complexity]
@@ -274,7 +274,7 @@ directory = "reports/coverage"
 
 
 [tool.uv]
-required-version = "==0.11.7"
+required-version = "==0.11.16"
 exclude-newer = "1 week"
 
 [tool.tox]
@@ -294,6 +294,6 @@ commands = [["pytest", { replace = "posargs", default = [], extend = true }]]
 # strings below are kept consistent with that version by hand (uv is mentioned in each).
 # `alpine-image` is mirrored literally in .gitlab-ci.yml's variables: block — GitLab
 # cannot evaluate `image:` from pyproject at pipeline-creation time.
-base-image = "ghcr.io/astral-sh/uv:0.11.7-python3.13-trixie-slim"
-uv-image = "ghcr.io/astral-sh/uv:0.11.7"
-alpine-image = "ghcr.io/astral-sh/uv:0.11.7-alpine3.22"
+base-image = "ghcr.io/astral-sh/uv:0.11.16-python3.13-trixie-slim"
+uv-image = "ghcr.io/astral-sh/uv:0.11.16"
+alpine-image = "ghcr.io/astral-sh/uv:0.11.16-alpine3.22"

{gitlab_mr_check-1.4.2 → gitlab_mr_check-1.5.0}/src/gitlab_mr_check/gitlab_mr_check.py

@@ -18,7 +18,6 @@
 import logging
 from dataclasses import asdict, dataclass, field
 from datetime import datetime
-from functools import partial
 from typing import Any
 
 import gitlab
@@ -138,14 +137,14 @@ def mr_updated_in_years(mr: gitlab.v4.objects.ProjectMergeRequest, years: list[i
     return datetime.fromisoformat(mr.updated_at).year in years
 
 
-def get_mrs_by_project(project: gitlab.v4.objects.Project, filters: list[Any]) -> list[Any]:
-    """Return all MRs from a project that pass every filter predicate."""
-    return [mr for mr in project.mergerequests.list(all=True) if all(f(mr) for f in filters)]
+def get_mrs_by_project(project: gitlab.v4.objects.Project, **list_kwargs: Any) -> list[Any]:  # noqa: ANN401
+    """Return all MRs from a project matching the given server-side list filters."""
+    return list(project.mergerequests.list(**list_kwargs))
 
 
-def get_mrs_by_projects(projects: list[tuple[str, Any]], filters: list[Any]) -> dict[str, list[Any]]:
-    """Return a mapping of project name to filtered MR list for each (name, project) pair."""
-    return {name: get_mrs_by_project(project, filters) for name, project in projects}
+def get_mrs_by_projects(projects: list[tuple[str, Any]], **list_kwargs: Any) -> dict[str, list[Any]]:  # noqa: ANN401
+    """Return a mapping of project name to MR list using the given server-side list filters."""
+    return {name: get_mrs_by_project(project, **list_kwargs) for name, project in projects}
 
 
 def evaluate_mrs_4eyes_per_project(project_mrs: dict[str, list[Any]]) -> list[ProjectMRAuditResult]:
@@ -178,7 +177,7 @@ def audit(url: str, token: str, config: Config) -> list[ProjectMRAuditResult]:
         List of per-project audit results, sorted by pass status, with empty projects excluded.
     """
     LOGGER.info('Starting audit validation for GitLab Merge Requests 4-eyes approval')
-    gl = gitlab.Gitlab(url, token)
+    gl = gitlab.Gitlab(url, token, retry_transient_errors=True, timeout=60)
 
     LOGGER.info('Getting the groups recursively')
     gl_groups = []
@@ -198,9 +197,14 @@ def audit(url: str, token: str, config: Config) -> list[ProjectMRAuditResult]:
     LOGGER.info('Found %d project(s)', len(gl_projects))
 
     LOGGER.info('Getting the merge requests under the projects')
+    years = config.gitlab.audit.years
     gl_project_mrs = get_mrs_by_projects(
         projects=gl_projects,
-        filters=[mr_is_merged, partial(mr_updated_in_years, years=config.gitlab.audit.years)],
+        state='merged',
+        updated_after=f'{min(years)}-01-01T00:00:00Z',
+        updated_before=f'{max(years) + 1}-01-01T00:00:00Z',
+        iterator=True,
+        per_page=50,
     )
 
     LOGGER.info('Evaluating merge requests for 4-eyes approval')