fix: add support for projects.groups.*

JohnVillalovos · JohnVillalovos · commit 979053c65115 · 2021-11-26T12:06:38.000-08:00
Add support for `projects.groups.*` endpoints.

Required re-arranging the code to prevent circular imports.
diff --git a/gitlab/v4/objects/groups.py b/gitlab/v4/objects/groups.py
@@ -30,22 +30,50 @@
 from .milestones import GroupMilestoneManager  # noqa: F401
 from .notification_settings import GroupNotificationSettingsManager  # noqa: F401
 from .packages import GroupPackageManager  # noqa: F401
-from .projects import GroupProjectManager  # noqa: F401
 from .runners import GroupRunnerManager  # noqa: F401
 from .statistics import GroupIssuesStatisticsManager  # noqa: F401
 from .variables import GroupVariableManager  # noqa: F401
 from .wikis import GroupWikiManager  # noqa: F401
 
 __all__ = [
     "Group",
-    "GroupManager",
     "GroupDescendantGroup",
     "GroupDescendantGroupManager",
+    "GroupManager",
+    "GroupProject",
+    "GroupProjectManager",
     "GroupSubgroup",
     "GroupSubgroupManager",
 ]
 
 
+class GroupProject(RESTObject):
+    pass
+
+
+class GroupProjectManager(ListMixin, RESTManager):
+    _path = "/groups/{group_id}/projects"
+    _obj_cls = GroupProject
+    _from_parent_attrs = {"group_id": "id"}
+    _list_filters = (
+        "archived",
+        "visibility",
+        "order_by",
+        "sort",
+        "search",
+        "simple",
+        "owned",
+        "starred",
+        "with_custom_attributes",
+        "include_subgroups",
+        "with_issues_enabled",
+        "with_merge_requests_enabled",
+        "with_shared",
+        "min_access_level",
+        "with_security_reports",
+    )
+
+
 class Group(SaveMixin, ObjectDeleteMixin, RESTObject):
     _short_print_attr = "name"
 
diff --git a/gitlab/v4/objects/projects.py b/gitlab/v4/objects/projects.py
@@ -32,6 +32,7 @@
 from .events import ProjectEventManager  # noqa: F401
 from .export_import import ProjectExportManager, ProjectImportManager  # noqa: F401
 from .files import ProjectFileManager  # noqa: F401
+from .groups import GroupManager  # noqa: F401
 from .hooks import ProjectHookManager  # noqa: F401
 from .issues import ProjectIssueManager  # noqa: F401
 from .jobs import ProjectJobManager  # noqa: F401
@@ -71,8 +72,6 @@
 from .wikis import ProjectWikiManager  # noqa: F401
 
 __all__ = [
-    "GroupProject",
-    "GroupProjectManager",
     "Project",
     "ProjectManager",
     "ProjectFork",
@@ -82,33 +81,6 @@
 ]
 
 
-class GroupProject(RESTObject):
-    pass
-
-
-class GroupProjectManager(ListMixin, RESTManager):
-    _path = "/groups/{group_id}/projects"
-    _obj_cls = GroupProject
-    _from_parent_attrs = {"group_id": "id"}
-    _list_filters = (
-        "archived",
-        "visibility",
-        "order_by",
-        "sort",
-        "search",
-        "simple",
-        "owned",
-        "starred",
-        "with_custom_attributes",
-        "include_subgroups",
-        "with_issues_enabled",
-        "with_merge_requests_enabled",
-        "with_shared",
-        "min_access_level",
-        "with_security_reports",
-    )
-
-
 class Project(RefreshMixin, SaveMixin, ObjectDeleteMixin, RepositoryMixin, RESTObject):
     _short_print_attr = "path"
 
@@ -132,6 +104,7 @@ class Project(RefreshMixin, SaveMixin, ObjectDeleteMixin, RepositoryMixin, RESTO
     files: ProjectFileManager
     forks: "ProjectForkManager"
     generic_packages: GenericPackageManager
+    groups: GroupManager
     hooks: ProjectHookManager
     imports: ProjectImportManager
     issues: ProjectIssueManager
