python-gitlab 5.5.0__py3-none-any.whl → 6.0.0__py3-none-any.whl

gitlab/v4/objects/templates.py

@@ -1,6 +1,4 @@
-from typing import Any, cast, Union
-
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import RetrieveMixin
 
 __all__ = [
@@ -31,141 +29,95 @@ class Dockerfile(RESTObject):
     _id_attr = "name"
 
 
-class DockerfileManager(RetrieveMixin, RESTManager):
+class DockerfileManager(RetrieveMixin[Dockerfile]):
     _path = "/templates/dockerfiles"
     _obj_cls = Dockerfile
 
-    def get(self, id: Union[str, int], lazy: bool = False, **kwargs: Any) -> Dockerfile:
-        return cast(Dockerfile, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class Gitignore(RESTObject):
     _id_attr = "name"
 
 
-class GitignoreManager(RetrieveMixin, RESTManager):
+class GitignoreManager(RetrieveMixin[Gitignore]):
     _path = "/templates/gitignores"
     _obj_cls = Gitignore
 
-    def get(self, id: Union[str, int], lazy: bool = False, **kwargs: Any) -> Gitignore:
-        return cast(Gitignore, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class Gitlabciyml(RESTObject):
     _id_attr = "name"
 
 
-class GitlabciymlManager(RetrieveMixin, RESTManager):
+class GitlabciymlManager(RetrieveMixin[Gitlabciyml]):
     _path = "/templates/gitlab_ci_ymls"
     _obj_cls = Gitlabciyml
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> Gitlabciyml:
-        return cast(Gitlabciyml, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class License(RESTObject):
     _id_attr = "key"
 
 
-class LicenseManager(RetrieveMixin, RESTManager):
+class LicenseManager(RetrieveMixin[License]):
     _path = "/templates/licenses"
     _obj_cls = License
     _list_filters = ("popular",)
     _optional_get_attrs = ("project", "fullname")
 
-    def get(self, id: Union[str, int], lazy: bool = False, **kwargs: Any) -> License:
-        return cast(License, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectDockerfileTemplate(RESTObject):
     _id_attr = "name"
 
 
-class ProjectDockerfileTemplateManager(RetrieveMixin, RESTManager):
+class ProjectDockerfileTemplateManager(RetrieveMixin[ProjectDockerfileTemplate]):
     _path = "/projects/{project_id}/templates/dockerfiles"
     _obj_cls = ProjectDockerfileTemplate
     _from_parent_attrs = {"project_id": "id"}
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectDockerfileTemplate:
-        return cast(ProjectDockerfileTemplate, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectGitignoreTemplate(RESTObject):
     _id_attr = "name"
 
 
-class ProjectGitignoreTemplateManager(RetrieveMixin, RESTManager):
+class ProjectGitignoreTemplateManager(RetrieveMixin[ProjectGitignoreTemplate]):
     _path = "/projects/{project_id}/templates/gitignores"
     _obj_cls = ProjectGitignoreTemplate
     _from_parent_attrs = {"project_id": "id"}
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectGitignoreTemplate:
-        return cast(ProjectGitignoreTemplate, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectGitlabciymlTemplate(RESTObject):
     _id_attr = "name"
 
 
-class ProjectGitlabciymlTemplateManager(RetrieveMixin, RESTManager):
+class ProjectGitlabciymlTemplateManager(RetrieveMixin[ProjectGitlabciymlTemplate]):
     _path = "/projects/{project_id}/templates/gitlab_ci_ymls"
     _obj_cls = ProjectGitlabciymlTemplate
     _from_parent_attrs = {"project_id": "id"}
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectGitlabciymlTemplate:
-        return cast(ProjectGitlabciymlTemplate, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectLicenseTemplate(RESTObject):
     _id_attr = "key"
 
 
-class ProjectLicenseTemplateManager(RetrieveMixin, RESTManager):
+class ProjectLicenseTemplateManager(RetrieveMixin[ProjectLicenseTemplate]):
     _path = "/projects/{project_id}/templates/licenses"
     _obj_cls = ProjectLicenseTemplate
     _from_parent_attrs = {"project_id": "id"}
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectLicenseTemplate:
-        return cast(ProjectLicenseTemplate, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectIssueTemplate(RESTObject):
     _id_attr = "name"
 
 
-class ProjectIssueTemplateManager(RetrieveMixin, RESTManager):
+class ProjectIssueTemplateManager(RetrieveMixin[ProjectIssueTemplate]):
     _path = "/projects/{project_id}/templates/issues"
     _obj_cls = ProjectIssueTemplate
     _from_parent_attrs = {"project_id": "id"}
 
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectIssueTemplate:
-        return cast(ProjectIssueTemplate, super().get(id=id, lazy=lazy, **kwargs))
-
 
 class ProjectMergeRequestTemplate(RESTObject):
     _id_attr = "name"
 
 
-class ProjectMergeRequestTemplateManager(RetrieveMixin, RESTManager):
+class ProjectMergeRequestTemplateManager(RetrieveMixin[ProjectMergeRequestTemplate]):
     _path = "/projects/{project_id}/templates/merge_requests"
     _obj_cls = ProjectMergeRequestTemplate
     _from_parent_attrs = {"project_id": "id"}
-
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectMergeRequestTemplate:
-        return cast(
-            ProjectMergeRequestTemplate, super().get(id=id, lazy=lazy, **kwargs)
-        )

gitlab/v4/objects/todos.py

@@ -2,13 +2,10 @@ from typing import Any, Dict, TYPE_CHECKING
 
 from gitlab import cli
 from gitlab import exceptions as exc
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import DeleteMixin, ListMixin, ObjectDeleteMixin
 
-__all__ = [
-    "Todo",
-    "TodoManager",
-]
+__all__ = ["Todo", "TodoManager"]
 
 
 class Todo(ObjectDeleteMixin, RESTObject):
@@ -35,7 +32,7 @@ class Todo(ObjectDeleteMixin, RESTObject):
         return server_data
 
 
-class TodoManager(ListMixin, DeleteMixin, RESTManager):
+class TodoManager(ListMixin[Todo], DeleteMixin[Todo]):
     _path = "/todos"
     _obj_cls = Todo
     _list_filters = ("action", "author_id", "project_id", "state", "type")

gitlab/v4/objects/topics.py

@@ -1,23 +1,22 @@
-from typing import Any, cast, Dict, TYPE_CHECKING, Union
+from __future__ import annotations
+
+from typing import Any, TYPE_CHECKING
 
 from gitlab import cli
 from gitlab import exceptions as exc
 from gitlab import types
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin
 from gitlab.types import RequiredOptional
 
-__all__ = [
-    "Topic",
-    "TopicManager",
-]
+__all__ = ["Topic", "TopicManager"]
 
 
 class Topic(SaveMixin, ObjectDeleteMixin, RESTObject):
     pass
 
 
-class TopicManager(CRUDMixin, RESTManager):
+class TopicManager(CRUDMixin[Topic]):
     _path = "/topics"
     _obj_cls = Topic
     _create_attrs = RequiredOptional(
@@ -29,20 +28,13 @@ class TopicManager(CRUDMixin, RESTManager):
     _update_attrs = RequiredOptional(optional=("avatar", "description", "name"))
     _types = {"avatar": types.ImageAttribute}
 
-    def get(self, id: Union[str, int], lazy: bool = False, **kwargs: Any) -> Topic:
-        return cast(Topic, super().get(id=id, lazy=lazy, **kwargs))
-
     @cli.register_custom_action(
-        cls_names="TopicManager",
-        required=("source_topic_id", "target_topic_id"),
+        cls_names="TopicManager", required=("source_topic_id", "target_topic_id")
     )
     @exc.on_http_error(exc.GitlabMRClosedError)
     def merge(
-        self,
-        source_topic_id: Union[int, str],
-        target_topic_id: Union[int, str],
-        **kwargs: Any,
-    ) -> Dict[str, Any]:
+        self, source_topic_id: int | str, target_topic_id: int | str, **kwargs: Any
+    ) -> dict[str, Any]:
         """Merge two topics, assigning all projects to the target topic.
 
         Args:
@@ -58,10 +50,7 @@ class TopicManager(CRUDMixin, RESTManager):
             The merged topic data (*not* a RESTObject)
         """
         path = f"{self.path}/merge"
-        data = {
-            "source_topic_id": source_topic_id,
-            "target_topic_id": target_topic_id,
-        }
+        data = {"source_topic_id": source_topic_id, "target_topic_id": target_topic_id}
 
         server_data = self.gitlab.http_post(path, post_data=data, **kwargs)
         if TYPE_CHECKING:

gitlab/v4/objects/triggers.py

@@ -1,27 +1,17 @@
-from typing import Any, cast, Union
-
-from gitlab.base import RESTManager, RESTObject
+from gitlab.base import RESTObject
 from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin
 from gitlab.types import RequiredOptional
 
-__all__ = [
-    "ProjectTrigger",
-    "ProjectTriggerManager",
-]
+__all__ = ["ProjectTrigger", "ProjectTriggerManager"]
 
 
 class ProjectTrigger(SaveMixin, ObjectDeleteMixin, RESTObject):
     pass
 
 
-class ProjectTriggerManager(CRUDMixin, RESTManager):
+class ProjectTriggerManager(CRUDMixin[ProjectTrigger]):
     _path = "/projects/{project_id}/triggers"
     _obj_cls = ProjectTrigger
     _from_parent_attrs = {"project_id": "id"}
     _create_attrs = RequiredOptional(required=("description",))
     _update_attrs = RequiredOptional(required=("description",))
-
-    def get(
-        self, id: Union[str, int], lazy: bool = False, **kwargs: Any
-    ) -> ProjectTrigger:
-        return cast(ProjectTrigger, super().get(id=id, lazy=lazy, **kwargs))