Feat/merge trains additional #2547 #3149

isaac-philip · 2025-03-09T19:14:20Z

Merge Trains Api additional support added :

Status of Merge Request on Merge Train
Add Merge Request to Merge Train

(can work to update the MR with docs till its reviewed/ required, thanks)

codecov · 2025-03-09T19:31:50Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 95.75%. Comparing base (378a836) to head (8c4720b).
⚠️ Report is 83 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3149      +/-   ##
==========================================
- Coverage   97.32%   95.75%   -1.57%     
==========================================
  Files          98       98              
  Lines        6057     6059       +2     
==========================================
- Hits         5895     5802      -93     
- Misses        162      257      +95

Flag	Coverage Δ
api_func_v4	`83.72% <87.50%> (-0.02%)`	⬇️
cli_func_v4	`78.70% <90.62%> (-5.99%)`	⬇️
unit	`90.21% <100.00%> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
gitlab/_version.py	`100.00% <100.00%> (ø)`
gitlab/cli.py	`91.09% <100.00%> (-8.91%)`	⬇️
gitlab/client.py	`98.55% <100.00%> (-0.19%)`	⬇️
gitlab/const.py	`100.00% <100.00%> (ø)`
gitlab/utils.py	`98.59% <100.00%> (ø)`
gitlab/v4/cli.py	`69.70% <100.00%> (-22.15%)`	⬇️
gitlab/v4/objects/ci_lint.py	`87.87% <100.00%> (-12.13%)`	⬇️
gitlab/v4/objects/jobs.py	`82.55% <100.00%> (ø)`
gitlab/v4/objects/merge_trains.py	`100.00% <100.00%> (ø)`
gitlab/v4/objects/notes.py	`100.00% <100.00%> (ø)`
... and 4 more

... and 7 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

isaac-philip · 2025-03-14T14:09:49Z

@nejch kindly take a look at this PR.

also if anybody else I should loop in here do share, thanks.

isaac-philip · 2025-03-29T05:31:20Z

@JohnVillalovos please let us know for any changes needed before merge, thanks.

…dd mr Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

…dd mr - test data modifications Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

…dd mr - minor changes Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

…dd mr - lint formatted by black Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

…dd mr - docs added Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

Copilot

Pull Request Overview

Adds support for two new Merge Train API operations: querying the status of a merge request on a merge train and adding a merge request to a merge train.

Define ProjectMergeTrainMergeRequest and its manager with GET/POST support
Wire the new manager into the ProjectMergeTrain object and expose the import in projects.py
Add unit tests and update documentation for the new endpoints

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File	Description
gitlab/v4/objects/merge_trains.py	Added `ProjectMergeTrainMergeRequest` and its manager; wired `merge_requests` on `ProjectMergeTrain`
gitlab/v4/objects/projects.py	Exposed `ProjectMergeTrainManager` import on `Project`
tests/unit/objects/test_merge_trains.py	Added fixtures and tests for GET/POST operations on merge train merge requests
docs/gl_objects/merge_trains.rst	Documented the new classes and examples for merge train merge requests

Comments suppressed due to low confidence (2)

tests/unit/objects/test_merge_trains.py:99

[nitpick] The test name uses plural 'merge_trains' while the related test below is named 'test_merge_train_add_merge_request'. Consider renaming for consistency.

def test_merge_trains_status_merge_request(

gitlab/v4/objects/projects.py:67

This import is not referenced directly in this file and will trigger a lint unused-import error. Reintroduce '# noqa: F401' to suppress the false-positive lint warning.

from .merge_trains import ProjectMergeTrainManager

Copilot · 2025-06-07T15:06:47Z

tests/unit/objects/test_merge_trains.py

    "duration": 70,
 }

+merge_train_update = mr_content.copy()


Using dict.copy() here performs a shallow copy, so nested structures (like the 'pipeline' dict) remain shared with mr_content and may be mutated unexpectedly. Consider using copy.deepcopy() to isolate test data changes.

Probably a good idea. Since line 51 would modify the underlying dict.

made the change

Copilot · 2025-06-07T15:06:47Z

docs/gl_objects/merge_trains.rst

+  + :class:`gilab.v4.objects.ProjectMergeTrainMergeRequest`
+  + :class:`gilab.v4.objects.ProjectMergeTrainMergeRequestManager`


Typo in the module path: 'gilab' should be spelled 'gitlab'.

Suggested change

+ :class:`gilab.v4.objects.ProjectMergeTrainMergeRequest`

+ :class:`gilab.v4.objects.ProjectMergeTrainMergeRequestManager`

+ :class:`gitlab.v4.objects.ProjectMergeTrainMergeRequest`

+ :class:`gitlab.v4.objects.ProjectMergeTrainMergeRequestManager`

made the change

JohnVillalovos

Thanks @isaac-philip

Just a few minor changes requested.

Also it could be squashed down to one commit most likely. That can be done when it is merged or you can do it when you update. Either works.

JohnVillalovos · 2025-06-07T15:32:06Z

gitlab/v4/objects/merge_trains.py

+    _update_method: UpdateMethod = UpdateMethod.POST
+
+    _update_attrs = RequiredOptional(
+        optional=("sha", "squash", "when_pipeline_succeeds")


Should auto_merge be added?

https://docs.gitlab.com/api/merge_trains/#add-a-merge-request-to-a-merge-train

JohnVillalovos · 2025-06-07T15:34:13Z

tests/unit/objects/test_merge_trains.py

    "duration": 70,
 }

+merge_train_update = mr_content.copy()


Probably a good idea. Since line 51 would modify the underlying dict.

github-actions · 2025-10-17T19:32:48Z

This Pull Request (PR) was marked stale because it has been open 90 days with no activity. Please remove the stale label or comment on this PR. Otherwise, it will be closed in 15 days.

github-actions · 2025-11-02T02:54:58Z

This PR was closed because it has been marked stale for 15 days with no activity. If this PR is still valid, please re-open.

There was an error in the type-hints that was detected when updating to mypy 1.16.0 The error was: $ mypy gitlab/v4/cli.py:411: error: Argument 1 to "cls_to_gitlab_resource" has incompatible type "type[Any]"; expected "RESTObject" [arg-type] Found 1 error in 1 file (checked 246 source files)

Also update the `stale` job to close issues with no activity, unless they are assigned to someone.

For the: "Publish package distributions to GitHub Releases" use the correct `secrets.RELEASE_GITHUB_TOKEN`. Before it was using `secrets.GITHUB_TOKEN` The other steps are already using `secrets.RELEASE_GITHUB_TOKEN` Closes: python-gitlab#3288

…on-gitlab#3218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…eletion

BREAKING CHANGE: GraphQL.execute() no longer accepts graphql.Source

…on-gitlab#3321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

…anges

JohnVillalovos · 2026-01-19T02:55:36Z

This was already closed. I re-opened it but it can not be rebased due to conflicts. I will close this again. @isaac-philip Feel free to open a new PR if you want to continue on this.

JohnVillalovos requested a review from Copilot April 7, 2025 01:50

This comment was marked as outdated.

Sign in to view

JohnVillalovos force-pushed the feat/merge_trains_additional branch from 51a93c1 to 7630232 Compare April 17, 2025 16:27

isaac-philip added 7 commits June 7, 2025 08:04

feat(functional): merge train -> merge request :> status fetch

761ff67

feat(functional): merge train -> merge request :> status fetch

e10ba0c

feat(functional): python-gitlab#2547 merge-train api for status and a…

cb4e015

…dd mr Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

feat(functional): python-gitlab#2547 merge-train api for status and a…

775cd78

…dd mr - test data modifications Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

feat(functional): python-gitlab#2547 merge-train api for status and a…

d444f04

…dd mr - minor changes Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

feat(functional): python-gitlab#2547 merge-train api for status and a…

60b0ec0

…dd mr - lint formatted by black Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

feat(functional): python-gitlab#2547 merge-train api for status and a…

3ac6561

…dd mr - docs added Signed-off-by: Isaac Philip <4974658+isaac-philip@users.noreply.github.com>

JohnVillalovos force-pushed the feat/merge_trains_additional branch from 7630232 to 3ac6561 Compare June 7, 2025 15:04

JohnVillalovos requested a review from Copilot June 7, 2025 15:05

Copilot AI reviewed Jun 7, 2025

View reviewed changes

JohnVillalovos requested changes Jun 7, 2025

View reviewed changes

github-actions bot added the stale label Oct 17, 2025

github-actions bot closed this Nov 2, 2025

JohnVillalovos and others added 9 commits January 18, 2026 23:20

chore(deps): update dependency requests to v2.32.4 [security]

134728d

chore(deps): update all non-major dependencies

d9925c1

chore(deps): update all non-major dependencies

6e3f64c

docs: update CONTRIBUTING.rst with policy on issue management

99dadf0

Also update the `stale` job to close issues with no activity, unless they are assigned to someone.

feat(const): add PLANNER_ACCESS constant

d827e76

chore: release v6.1.0

9a21fd5

chore(deps): update pre-commit hook maxbrunet/pre-commit-renovate to v41

74af1c1

chore(deps): update all non-major dependencies

f76d2b6

semantic-release and others added 27 commits January 18, 2026 23:20

chore: release v7.0.0

8356459

chore(deps): update all non-major dependencies

b52b5f4

chore(deps): update all non-major dependencies

2054e8a

chore(deps): update all non-major dependencies

9e6d908

chore(deps): update all non-major dependencies

0e90cfd

chore(deps): update dependency pytest to v9

f2aa0ca

chore(deps): update pre-commit hook maxbrunet/pre-commit-renovate to v42

b074cd6

chore(deps): update all non-major dependencies

6124359

chore(deps): update actions/checkout action to v6

4cb046a

chore(deps): update all non-major dependencies

0b05ef4

chore(deps): update all non-major dependencies

92e5057

fix(utils): prevent negative sleep time in rate limit retry

dc1d0af

chore(deps): update all non-major dependencies

2cd9077

chore(deps): update dessant/lock-threads action to v6

8cddd75

chore(deps): update all non-major dependencies

21ccc56

test(functional): update to GitLab 18.6 and resolve issues found

ecaed13

chore(deps): update gitlab/gitlab-ee docker tag to v18.7.0-ee.0 (pyth…

9ab5cd7

…on-gitlab#3218) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

feat(registry-protection): add support for registry protection rule d…

fd55caf

…eletion

chore(deps): update github artifact actions

845543a

chore: release v7.1.0

99761a6

chore(deps): update all non-major dependencies

11180ac

feat(graphql): update to gql 4.0.0

c21dce4

BREAKING CHANGE: GraphQL.execute() no longer accepts graphql.Source

chore(deps): update all non-major dependencies

01f4a83

chore(deps): update gitlab/gitlab-ee docker tag to v18.7.1-ee.0 (pyth…

77d6d0b

…on-gitlab#3321) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

chore(deps): update all non-major dependencies

309b12c

feat(functional): python-gitlab#2547 merge-train api : CR comments ch…

8c4720b

…anges

JohnVillalovos reopened this Jan 19, 2026

JohnVillalovos closed this Jan 19, 2026

		+ :class:`gilab.v4.objects.ProjectMergeTrainMergeRequest`
		+ :class:`gilab.v4.objects.ProjectMergeTrainMergeRequestManager`

Feat/merge trains additional #2547 #3149

Feat/merge trains additional #2547 #3149

Conversation

isaac-philip commented Mar 9, 2025

Merge Trains Api additional support added :

Uh oh!

codecov bot commented Mar 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

isaac-philip commented Mar 14, 2025

Uh oh!

isaac-philip commented Mar 29, 2025

Uh oh!

This comment was marked as outdated.

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

JohnVillalovos Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

isaac-philip Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

isaac-philip Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

JohnVillalovos left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

JohnVillalovos Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

isaac-philip Jan 18, 2026

Choose a reason for hiding this comment

Uh oh!

JohnVillalovos Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Oct 17, 2025

Uh oh!

github-actions bot commented Nov 2, 2025

Uh oh!

JohnVillalovos commented Jan 19, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov bot commented Mar 9, 2025 •

edited

Loading

JohnVillalovos left a comment •

edited

Loading