diff options
author | John L. Villalovos <john@sodarock.com> | 2022-05-31 07:46:37 -0700 |
---|---|---|
committer | John L. Villalovos <john@sodarock.com> | 2022-05-31 07:46:37 -0700 |
commit | 7d26530640eb406479f1604cb64748d278081864 (patch) | |
tree | af198b756ca6879f0104be2b0857fa1cfee9e694 /gitlab/v4/objects | |
parent | 1f17349826a0516c648db20ae80ac713bab8a160 (diff) | |
download | gitlab-7d26530640eb406479f1604cb64748d278081864.tar.gz |
chore: move `RequiredOptional` to the `gitlab.types` module
By having `RequiredOptional` in the `gitlab.base` module it makes it
difficult with circular imports. Move it to the `gitlab.types`
module which has no dependencies on any other gitlab module.
Diffstat (limited to 'gitlab/v4/objects')
43 files changed, 86 insertions, 43 deletions
diff --git a/gitlab/v4/objects/appearance.py b/gitlab/v4/objects/appearance.py index 6a1f974..db4b551 100644 --- a/gitlab/v4/objects/appearance.py +++ b/gitlab/v4/objects/appearance.py @@ -1,8 +1,9 @@ from typing import Any, cast, Dict, Optional, Union from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin +from gitlab.types import RequiredOptional __all__ = [ "ApplicationAppearance", diff --git a/gitlab/v4/objects/applications.py b/gitlab/v4/objects/applications.py index 926d189..921bd0e 100644 --- a/gitlab/v4/objects/applications.py +++ b/gitlab/v4/objects/applications.py @@ -1,5 +1,6 @@ -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin +from gitlab.types import RequiredOptional __all__ = [ "Application", diff --git a/gitlab/v4/objects/award_emojis.py b/gitlab/v4/objects/award_emojis.py index 3f9d777..cddf97f 100644 --- a/gitlab/v4/objects/award_emojis.py +++ b/gitlab/v4/objects/award_emojis.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin +from gitlab.types import RequiredOptional __all__ = [ "GroupEpicAwardEmoji", diff --git a/gitlab/v4/objects/badges.py b/gitlab/v4/objects/badges.py index 4dee75a..3df5d0b 100644 --- a/gitlab/v4/objects/badges.py +++ b/gitlab/v4/objects/badges.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import BadgeRenderMixin, CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "GroupBadge", diff --git a/gitlab/v4/objects/boards.py b/gitlab/v4/objects/boards.py index 73c652b..a5c59b3 100644 --- a/gitlab/v4/objects/boards.py +++ b/gitlab/v4/objects/boards.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "GroupBoardList", diff --git a/gitlab/v4/objects/branches.py b/gitlab/v4/objects/branches.py index d06d6b4..8c6e86c 100644 --- a/gitlab/v4/objects/branches.py +++ b/gitlab/v4/objects/branches.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin +from gitlab.types import RequiredOptional __all__ = [ "ProjectBranch", diff --git a/gitlab/v4/objects/broadcast_messages.py b/gitlab/v4/objects/broadcast_messages.py index 7e28be6..3beb4ac 100644 --- a/gitlab/v4/objects/broadcast_messages.py +++ b/gitlab/v4/objects/broadcast_messages.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "BroadcastMessage", diff --git a/gitlab/v4/objects/clusters.py b/gitlab/v4/objects/clusters.py index dc02ee0..d51a97a 100644 --- a/gitlab/v4/objects/clusters.py +++ b/gitlab/v4/objects/clusters.py @@ -1,8 +1,9 @@ from typing import Any, cast, Dict, Optional, Union from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "GroupCluster", diff --git a/gitlab/v4/objects/commits.py b/gitlab/v4/objects/commits.py index 19098af..8558ef9 100644 --- a/gitlab/v4/objects/commits.py +++ b/gitlab/v4/objects/commits.py @@ -5,8 +5,9 @@ import requests import gitlab from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, ListMixin, RefreshMixin, RetrieveMixin +from gitlab.types import RequiredOptional from .discussions import ProjectCommitDiscussionManager # noqa: F401 diff --git a/gitlab/v4/objects/deploy_keys.py b/gitlab/v4/objects/deploy_keys.py index f325f69..0962b4a 100644 --- a/gitlab/v4/objects/deploy_keys.py +++ b/gitlab/v4/objects/deploy_keys.py @@ -4,8 +4,9 @@ import requests from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "DeployKey", diff --git a/gitlab/v4/objects/deploy_tokens.py b/gitlab/v4/objects/deploy_tokens.py index 9fcfc23..32bb5fe 100644 --- a/gitlab/v4/objects/deploy_tokens.py +++ b/gitlab/v4/objects/deploy_tokens.py @@ -1,7 +1,7 @@ from typing import Any, cast, Union from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, DeleteMixin, @@ -9,6 +9,7 @@ from gitlab.mixins import ( ObjectDeleteMixin, RetrieveMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "DeployToken", diff --git a/gitlab/v4/objects/deployments.py b/gitlab/v4/objects/deployments.py index 9aee699..a431603 100644 --- a/gitlab/v4/objects/deployments.py +++ b/gitlab/v4/objects/deployments.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, RetrieveMixin, SaveMixin, UpdateMixin +from gitlab.types import RequiredOptional from .merge_requests import ProjectDeploymentMergeRequestManager # noqa: F401 diff --git a/gitlab/v4/objects/discussions.py b/gitlab/v4/objects/discussions.py index fa874c4..9cfce72 100644 --- a/gitlab/v4/objects/discussions.py +++ b/gitlab/v4/objects/discussions.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, RetrieveMixin, SaveMixin, UpdateMixin +from gitlab.types import RequiredOptional from .notes import ( # noqa: F401 ProjectCommitDiscussionNoteManager, diff --git a/gitlab/v4/objects/environments.py b/gitlab/v4/objects/environments.py index 681e7ee..7e2089f 100644 --- a/gitlab/v4/objects/environments.py +++ b/gitlab/v4/objects/environments.py @@ -4,7 +4,7 @@ import requests from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, DeleteMixin, @@ -13,6 +13,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "ProjectEnvironment", diff --git a/gitlab/v4/objects/epics.py b/gitlab/v4/objects/epics.py index d33821c..76dadf2 100644 --- a/gitlab/v4/objects/epics.py +++ b/gitlab/v4/objects/epics.py @@ -2,7 +2,7 @@ from typing import Any, cast, Dict, Optional, TYPE_CHECKING, Union from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -12,6 +12,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional from .events import GroupEpicResourceLabelEventManager # noqa: F401 diff --git a/gitlab/v4/objects/export_import.py b/gitlab/v4/objects/export_import.py index 49c9e0c..a275164 100644 --- a/gitlab/v4/objects/export_import.py +++ b/gitlab/v4/objects/export_import.py @@ -1,7 +1,8 @@ from typing import Any, cast, Optional, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, DownloadMixin, GetWithoutIdMixin, RefreshMixin +from gitlab.types import RequiredOptional __all__ = [ "GroupExport", diff --git a/gitlab/v4/objects/files.py b/gitlab/v4/objects/files.py index e5345ce..c0b7261 100644 --- a/gitlab/v4/objects/files.py +++ b/gitlab/v4/objects/files.py @@ -6,7 +6,7 @@ import requests from gitlab import cli from gitlab import exceptions as exc from gitlab import utils -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, DeleteMixin, @@ -15,6 +15,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "ProjectFile", diff --git a/gitlab/v4/objects/geo_nodes.py b/gitlab/v4/objects/geo_nodes.py index 6633275..70e9f71 100644 --- a/gitlab/v4/objects/geo_nodes.py +++ b/gitlab/v4/objects/geo_nodes.py @@ -2,7 +2,7 @@ from typing import Any, cast, Dict, List, TYPE_CHECKING, Union from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( DeleteMixin, ObjectDeleteMixin, @@ -10,6 +10,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "GeoNode", diff --git a/gitlab/v4/objects/groups.py b/gitlab/v4/objects/groups.py index 28f3623..33f5be1 100644 --- a/gitlab/v4/objects/groups.py +++ b/gitlab/v4/objects/groups.py @@ -6,8 +6,9 @@ import gitlab from gitlab import cli from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional from .access_requests import GroupAccessRequestManager # noqa: F401 from .audit_events import GroupAuditEventManager # noqa: F401 diff --git a/gitlab/v4/objects/hooks.py b/gitlab/v4/objects/hooks.py index f37d514..aa0ff03 100644 --- a/gitlab/v4/objects/hooks.py +++ b/gitlab/v4/objects/hooks.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, NoUpdateMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "Hook", diff --git a/gitlab/v4/objects/issues.py b/gitlab/v4/objects/issues.py index 693c18f..e368357 100644 --- a/gitlab/v4/objects/issues.py +++ b/gitlab/v4/objects/issues.py @@ -3,7 +3,7 @@ from typing import Any, cast, Dict, Tuple, TYPE_CHECKING, Union from gitlab import cli from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -18,6 +18,7 @@ from gitlab.mixins import ( TodoMixin, UserAgentDetailMixin, ) +from gitlab.types import RequiredOptional from .award_emojis import ProjectIssueAwardEmojiManager # noqa: F401 from .discussions import ProjectIssueDiscussionManager # noqa: F401 diff --git a/gitlab/v4/objects/labels.py b/gitlab/v4/objects/labels.py index 165bdb9..68f37b3 100644 --- a/gitlab/v4/objects/labels.py +++ b/gitlab/v4/objects/labels.py @@ -1,7 +1,7 @@ from typing import Any, cast, Dict, Optional, Union from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, DeleteMixin, @@ -12,6 +12,7 @@ from gitlab.mixins import ( SubscribableMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "GroupLabel", diff --git a/gitlab/v4/objects/members.py b/gitlab/v4/objects/members.py index d5d8766..af25085 100644 --- a/gitlab/v4/objects/members.py +++ b/gitlab/v4/objects/members.py @@ -1,7 +1,7 @@ from typing import Any, cast, Union from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CRUDMixin, DeleteMixin, @@ -10,6 +10,7 @@ from gitlab.mixins import ( RetrieveMixin, SaveMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "GroupBillableMember", diff --git a/gitlab/v4/objects/merge_request_approvals.py b/gitlab/v4/objects/merge_request_approvals.py index f23fcf0..36224d1 100644 --- a/gitlab/v4/objects/merge_request_approvals.py +++ b/gitlab/v4/objects/merge_request_approvals.py @@ -1,7 +1,7 @@ from typing import Any, cast, Dict, List, Optional, TYPE_CHECKING, Union from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, DeleteMixin, @@ -11,6 +11,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "ProjectApproval", diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py index a3c583b..9eb965b 100644 --- a/gitlab/v4/objects/merge_requests.py +++ b/gitlab/v4/objects/merge_requests.py @@ -11,7 +11,7 @@ import gitlab from gitlab import cli from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject, RESTObjectList +from gitlab.base import RESTManager, RESTObject, RESTObjectList from gitlab.mixins import ( CRUDMixin, ListMixin, @@ -23,6 +23,7 @@ from gitlab.mixins import ( TimeTrackingMixin, TodoMixin, ) +from gitlab.types import RequiredOptional from .award_emojis import ProjectMergeRequestAwardEmojiManager # noqa: F401 from .commits import ProjectCommit, ProjectCommitManager diff --git a/gitlab/v4/objects/milestones.py b/gitlab/v4/objects/milestones.py index 0c4d74b..2d82a59 100644 --- a/gitlab/v4/objects/milestones.py +++ b/gitlab/v4/objects/milestones.py @@ -3,8 +3,9 @@ from typing import Any, cast, TYPE_CHECKING, Union from gitlab import cli from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject, RESTObjectList +from gitlab.base import RESTManager, RESTObject, RESTObjectList from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, PromoteMixin, SaveMixin +from gitlab.types import RequiredOptional from .issues import GroupIssue, GroupIssueManager, ProjectIssue, ProjectIssueManager from .merge_requests import ( diff --git a/gitlab/v4/objects/notes.py b/gitlab/v4/objects/notes.py index 833f632..06605bc 100644 --- a/gitlab/v4/objects/notes.py +++ b/gitlab/v4/objects/notes.py @@ -1,6 +1,6 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -11,6 +11,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional from .award_emojis import ( # noqa: F401 GroupEpicNoteAwardEmojiManager, diff --git a/gitlab/v4/objects/notification_settings.py b/gitlab/v4/objects/notification_settings.py index 4dd8347..d3cd4cb 100644 --- a/gitlab/v4/objects/notification_settings.py +++ b/gitlab/v4/objects/notification_settings.py @@ -1,7 +1,8 @@ from typing import Any, cast, Optional, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin +from gitlab.types import RequiredOptional __all__ = [ "NotificationSettings", diff --git a/gitlab/v4/objects/pages.py b/gitlab/v4/objects/pages.py index 3fc0404..ed0ed3e 100644 --- a/gitlab/v4/objects/pages.py +++ b/gitlab/v4/objects/pages.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "PagesDomain", diff --git a/gitlab/v4/objects/personal_access_tokens.py b/gitlab/v4/objects/personal_access_tokens.py index 74ba231..5e4e54b 100644 --- a/gitlab/v4/objects/personal_access_tokens.py +++ b/gitlab/v4/objects/personal_access_tokens.py @@ -1,5 +1,6 @@ -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin +from gitlab.types import RequiredOptional __all__ = [ "PersonalAccessToken", diff --git a/gitlab/v4/objects/pipelines.py b/gitlab/v4/objects/pipelines.py index 480b8c0..0db82a3 100644 --- a/gitlab/v4/objects/pipelines.py +++ b/gitlab/v4/objects/pipelines.py @@ -4,7 +4,7 @@ import requests from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -17,6 +17,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "ProjectMergeRequestPipeline", diff --git a/gitlab/v4/objects/projects.py b/gitlab/v4/objects/projects.py index 6eaacf3..8674ee6 100644 --- a/gitlab/v4/objects/projects.py +++ b/gitlab/v4/objects/projects.py @@ -5,7 +5,7 @@ import requests from gitlab import cli, client from gitlab import exceptions as exc from gitlab import types, utils -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -16,6 +16,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional from .access_requests import ProjectAccessRequestManager # noqa: F401 from .artifacts import ProjectArtifactManager # noqa: F401 diff --git a/gitlab/v4/objects/push_rules.py b/gitlab/v4/objects/push_rules.py index 4adfc2e..ce75eac 100644 --- a/gitlab/v4/objects/push_rules.py +++ b/gitlab/v4/objects/push_rules.py @@ -1,6 +1,6 @@ from typing import Any, cast, Optional, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, DeleteMixin, @@ -9,6 +9,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "ProjectPushRules", diff --git a/gitlab/v4/objects/releases.py b/gitlab/v4/objects/releases.py index e14f42a..788c050 100644 --- a/gitlab/v4/objects/releases.py +++ b/gitlab/v4/objects/releases.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "ProjectRelease", diff --git a/gitlab/v4/objects/runners.py b/gitlab/v4/objects/runners.py index 51f6861..4f9d7ce 100644 --- a/gitlab/v4/objects/runners.py +++ b/gitlab/v4/objects/runners.py @@ -3,7 +3,7 @@ from typing import Any, cast, List, Optional, Union from gitlab import cli from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -12,6 +12,7 @@ from gitlab.mixins import ( ObjectDeleteMixin, SaveMixin, ) +from gitlab.types import RequiredOptional __all__ = [ "RunnerJob", diff --git a/gitlab/v4/objects/settings.py b/gitlab/v4/objects/settings.py index 071f7e4..6171833 100644 --- a/gitlab/v4/objects/settings.py +++ b/gitlab/v4/objects/settings.py @@ -2,8 +2,9 @@ from typing import Any, cast, Dict, Optional, Union from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin +from gitlab.types import RequiredOptional __all__ = [ "ApplicationSettings", diff --git a/gitlab/v4/objects/snippets.py b/gitlab/v4/objects/snippets.py index 83b1378..597a3aa 100644 --- a/gitlab/v4/objects/snippets.py +++ b/gitlab/v4/objects/snippets.py @@ -5,8 +5,9 @@ import requests from gitlab import cli from gitlab import exceptions as exc from gitlab import utils -from gitlab.base import RequiredOptional, RESTManager, RESTObject, RESTObjectList +from gitlab.base import RESTManager, RESTObject, RESTObjectList from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin, UserAgentDetailMixin +from gitlab.types import RequiredOptional from .award_emojis import ProjectSnippetAwardEmojiManager # noqa: F401 from .discussions import ProjectSnippetDiscussionManager # noqa: F401 diff --git a/gitlab/v4/objects/tags.py b/gitlab/v4/objects/tags.py index 748cbad..4334264 100644 --- a/gitlab/v4/objects/tags.py +++ b/gitlab/v4/objects/tags.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin +from gitlab.types import RequiredOptional __all__ = [ "ProjectTag", diff --git a/gitlab/v4/objects/topics.py b/gitlab/v4/objects/topics.py index 76208ed..57b104e 100644 --- a/gitlab/v4/objects/topics.py +++ b/gitlab/v4/objects/topics.py @@ -1,8 +1,9 @@ from typing import Any, cast, Union from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "Topic", diff --git a/gitlab/v4/objects/triggers.py b/gitlab/v4/objects/triggers.py index e75be13..8c0d885 100644 --- a/gitlab/v4/objects/triggers.py +++ b/gitlab/v4/objects/triggers.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "ProjectTrigger", diff --git a/gitlab/v4/objects/users.py b/gitlab/v4/objects/users.py index 81a8aaa..acd3b2f 100644 --- a/gitlab/v4/objects/users.py +++ b/gitlab/v4/objects/users.py @@ -10,7 +10,7 @@ import requests from gitlab import cli from gitlab import exceptions as exc from gitlab import types -from gitlab.base import RequiredOptional, RESTManager, RESTObject, RESTObjectList +from gitlab.base import RESTManager, RESTObject, RESTObjectList from gitlab.mixins import ( CreateMixin, CRUDMixin, @@ -23,6 +23,7 @@ from gitlab.mixins import ( SaveMixin, UpdateMixin, ) +from gitlab.types import RequiredOptional from .custom_attributes import UserCustomAttributeManager # noqa: F401 from .events import UserEventManager # noqa: F401 diff --git a/gitlab/v4/objects/variables.py b/gitlab/v4/objects/variables.py index ba425c8..62ea872 100644 --- a/gitlab/v4/objects/variables.py +++ b/gitlab/v4/objects/variables.py @@ -6,8 +6,9 @@ https://docs.gitlab.com/ee/api/group_level_variables.html """ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "Variable", diff --git a/gitlab/v4/objects/wikis.py b/gitlab/v4/objects/wikis.py index a7028cf..712b733 100644 --- a/gitlab/v4/objects/wikis.py +++ b/gitlab/v4/objects/wikis.py @@ -1,7 +1,8 @@ from typing import Any, cast, Union -from gitlab.base import RequiredOptional, RESTManager, RESTObject +from gitlab.base import RESTManager, RESTObject from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin +from gitlab.types import RequiredOptional __all__ = [ "ProjectWiki", |