Merge branch 'python-gitlab:main' into fix/add-missing-status-check-methods

SachinKSingh28 · SachinKSingh28 · commit af3f374c8764 · 2025-02-08T23:04:52.000Z
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -26,18 +26,13 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5.4.0
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - name: Install dependencies
         run: pip install tox
       - name: Build docs
         env:
           TOXENV: docs
         run: tox
-      - name: Archive generated docs
-        uses: actions/upload-artifact@v4.6.0
-        with:
-          name: html-docs
-          path: build/sphinx/html/
 
   twine-check:
     runs-on: ubuntu-24.04
@@ -46,7 +41,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5.4.0
         with:
-          python-version: "3.12"
+          python-version: "3.13"
       - name: Install dependencies
         run: pip install tox twine wheel
       - name: Check twine readme rendering
diff --git a/docs/gl_objects/deploy_keys.rst b/docs/gl_objects/deploy_keys.rst
@@ -19,7 +19,11 @@ Reference
 Examples
 --------
 
-List the deploy keys::
+Add an instance-wide deploy key (requires admin access)::
+
+    keys = gl.deploykeys.create({'title': 'instance key', 'key': INSTANCE_KEY})
+
+List all deploy keys::
 
     keys = gl.deploykeys.list()
 
diff --git a/gitlab/v4/objects/deploy_keys.py b/gitlab/v4/objects/deploy_keys.py
@@ -7,7 +7,13 @@
 from gitlab import cli
 from gitlab import exceptions as exc
 from gitlab.base import RESTObject
-from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin
+from gitlab.mixins import (
+    CreateMixin,
+    CRUDMixin,
+    ListMixin,
+    ObjectDeleteMixin,
+    SaveMixin,
+)
 from gitlab.types import RequiredOptional
 
 __all__ = ["DeployKey", "DeployKeyManager", "ProjectKey", "ProjectKeyManager"]
@@ -17,9 +23,12 @@ class DeployKey(RESTObject):
     pass
 
 
-class DeployKeyManager(ListMixin[DeployKey]):
+class DeployKeyManager(CreateMixin[DeployKey], ListMixin[DeployKey]):
     _path = "/deploy_keys"
     _obj_cls = DeployKey
+    _create_attrs = RequiredOptional(
+        required=("title", "key"), optional=("expires_at",)
+    )
 
 
 class ProjectKey(SaveMixin, ObjectDeleteMixin, RESTObject):
@@ -30,8 +39,10 @@ class ProjectKeyManager(CRUDMixin[ProjectKey]):
     _path = "/projects/{project_id}/deploy_keys"
     _obj_cls = ProjectKey
     _from_parent_attrs = {"project_id": "id"}
-    _create_attrs = RequiredOptional(required=("title", "key"), optional=("can_push",))
-    _update_attrs = RequiredOptional(optional=("title", "can_push"))
+    _create_attrs = RequiredOptional(
+        required=("title", "key"), optional=("can_push", "expires_at")
+    )
+    _update_attrs = RequiredOptional(optional=("title", "can_push", "expires_at"))
 
     @cli.register_custom_action(
         cls_names="ProjectKeyManager",
diff --git a/tests/functional/api/test_deploy_keys.py b/tests/functional/api/test_deploy_keys.py
@@ -1,4 +1,13 @@
-def test_project_deploy_keys(gl, project, DEPLOY_KEY):
+from gitlab import Gitlab
+from gitlab.v4.objects import Project
+
+
+def test_deploy_keys(gl: Gitlab, DEPLOY_KEY: str) -> None:
+    deploy_key = gl.deploykeys.create({"title": "foo@bar", "key": DEPLOY_KEY})
+    assert deploy_key in gl.deploykeys.list(get_all=False)
+
+
+def test_project_deploy_keys(gl: Gitlab, project: Project, DEPLOY_KEY: str) -> None:
     deploy_key = project.keys.create({"title": "foo@bar", "key": DEPLOY_KEY})
     assert deploy_key in project.keys.list()
 
diff --git a/tests/unit/objects/test_status_checks.py b/tests/unit/objects/test_status_checks.py
@@ -8,7 +8,7 @@
 mr_content = {
     "id": 1,
     "iid": 1,
-    "project_id": 3,
+    "project_id": 1,
     "title": "test1",
     "description": "fixed login page css paddings",
     "state": "merged",
