chore: fix import ordering using isort

Fix the import ordering using isort.

https://pycqa.github.io/isort/

gitlab/__init__.py

@@ -31,5 +31,4 @@
 from gitlab.const import *  # noqa: F401,F403
 from gitlab.exceptions import *  # noqa: F401,F403
 
-
 warnings.filterwarnings("default", category=DeprecationWarning, module="^gitlab")

gitlab/__main__.py

@@ -1,5 +1,4 @@
 import gitlab.cli
 
-
 if __name__ == "__main__":
     gitlab.cli.main()

gitlab/base.py

@@ -19,9 +19,10 @@
 from types import ModuleType
 from typing import Any, Dict, Iterable, NamedTuple, Optional, Tuple, Type
 
-from .client import Gitlab, GitlabList
 from gitlab import types as g_types
 
+from .client import Gitlab, GitlabList
+
 __all__ = [
     "RequiredOptional",
     "RESTObject",

gitlab/cli.py

@@ -28,7 +28,6 @@
 import gitlab.config
 from gitlab.base import RESTObject
 
-
 # This regex is based on:
 # https://github.com/jpvanhal/inflection/blob/master/inflection/__init__.py
 camel_upperlower_regex = re.compile(r"([A-Z]+)([A-Z][a-z])")

gitlab/client.py

@@ -17,17 +17,16 @@
 """Wrapper for the GitLab API."""
 
 import time
-from typing import cast, Any, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
+from typing import Any, cast, Dict, List, Optional, Tuple, TYPE_CHECKING, Union
 
 import requests
 import requests.utils
+from requests_toolbelt.multipart.encoder import MultipartEncoder  # type: ignore
 
 import gitlab.config
 import gitlab.const
 import gitlab.exceptions
 from gitlab import utils
-from requests_toolbelt.multipart.encoder import MultipartEncoder  # type: ignore
-
 
 REDIRECT_MSG = (
     "python-gitlab detected an http to https redirection. You "
@@ -385,7 +384,6 @@ def _set_auth_info(self) -> None:
 
     def enable_debug(self) -> None:
         import logging
-
         from http.client import HTTPConnection  # noqa
 
         HTTPConnection.debuglevel = 1  # type: ignore

gitlab/config.py

@@ -15,12 +15,12 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import os
 import configparser
+import os
 import shlex
 import subprocess
-from typing import List, Optional, Union
 from os.path import expanduser, expandvars
+from typing import List, Optional, Union
 
 from gitlab.const import USER_AGENT
 

gitlab/const.py

@@ -17,7 +17,6 @@
 
 from gitlab.__version__ import __title__, __version__
 
-
 NO_ACCESS: int = 0
 MINIMAL_ACCESS: int = 5
 GUEST_ACCESS: int = 10

gitlab/exceptions.py

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import functools
-from typing import Any, Callable, cast, Optional, Type, TypeVar, TYPE_CHECKING, Union
+from typing import Any, Callable, cast, Optional, Type, TYPE_CHECKING, TypeVar, Union
 
 
 class GitlabError(Exception):

gitlab/mixins.py

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import warnings
 from types import ModuleType
 from typing import (
     Any,
@@ -31,12 +32,10 @@
 import requests
 
 import gitlab
-from gitlab import base
-from gitlab import cli
+from gitlab import base, cli
 from gitlab import exceptions as exc
 from gitlab import types as g_types
 from gitlab import utils
-import warnings
 
 __all__ = [
     "GetMixin",

gitlab/tests/conftest.py

@@ -1,4 +1,5 @@
 import pytest
+
 import gitlab
 
 

gitlab/tests/mixins/test_meta_mixins.py

@@ -5,8 +5,8 @@
     GetMixin,
     ListMixin,
     NoUpdateMixin,
-    UpdateMixin,
     RetrieveMixin,
+    UpdateMixin,
 )
 
 

gitlab/tests/mixins/test_mixin_methods.py

@@ -1,5 +1,4 @@
 import pytest
-
 from httmock import HTTMock, response, urlmatch  # noqa
 
 from gitlab import base

gitlab/tests/objects/test_appearance.py

@@ -5,7 +5,6 @@
 import pytest
 import responses
 
-
 title = "GitLab Test Instance"
 description = "gitlab-test.example.com"
 new_title = "new-title"

gitlab/tests/objects/test_applications.py

@@ -5,7 +5,6 @@
 import pytest
 import responses
 
-
 title = "GitLab Test Instance"
 description = "gitlab-test.example.com"
 new_title = "new-title"

gitlab/tests/objects/test_badges.py

@@ -7,7 +7,7 @@
 import pytest
 import responses
 
-from gitlab.v4.objects import ProjectBadge, GroupBadge
+from gitlab.v4.objects import GroupBadge, ProjectBadge
 
 link_url = (
     "http://example.com/ci_status.svg?project=example-org/example-project&ref=master"

gitlab/tests/objects/test_deploy_tokens.py

@@ -6,7 +6,6 @@
 
 from gitlab.v4.objects import ProjectDeployToken
 
-
 create_content = {
     "id": 1,
     "name": "test_deploy_token",

gitlab/tests/objects/test_job_artifacts.py

@@ -5,7 +5,6 @@
 import pytest
 import responses
 
-
 ref_name = "master"
 job = "build"
 

gitlab/tests/objects/test_jobs.py

@@ -6,7 +6,6 @@
 
 from gitlab.v4.objects import ProjectJob
 
-
 job_content = {
     "commit": {
         "author_email": "admin@example.com",

gitlab/tests/objects/test_packages.py

@@ -8,7 +8,6 @@
 
 from gitlab.v4.objects import GroupPackage, ProjectPackage, ProjectPackageFile
 
-
 package_content = {
     "id": 1,
     "name": "com/mycompany/my-app",

gitlab/tests/objects/test_pipelines.py

@@ -6,7 +6,6 @@
 
 from gitlab.v4.objects import ProjectPipeline
 
-
 pipeline_content = {
     "id": 46,
     "project_id": 1,

gitlab/tests/objects/test_project_merge_request_approvals.py

@@ -9,7 +9,6 @@
 
 import gitlab
 
-
 approval_rule_id = 1
 approval_rule_name = "security"
 approvals_required = 3

gitlab/tests/objects/test_projects.py

@@ -7,7 +7,6 @@
 
 from gitlab.v4.objects import Project
 
-
 project_content = {"name": "name", "id": 1}
 import_content = {
     "id": 1,

gitlab/tests/objects/test_resource_label_events.py

@@ -6,9 +6,9 @@
 import responses
 
 from gitlab.v4.objects import (
+    GroupEpicResourceLabelEvent,
     ProjectIssueResourceLabelEvent,
     ProjectMergeRequestResourceLabelEvent,
-    GroupEpicResourceLabelEvent,
 )
 
 

gitlab/tests/objects/test_resource_state_events.py

@@ -10,7 +10,6 @@
     ProjectMergeRequestResourceStateEvent,
 )
 
-
 issue_event_content = {"id": 1, "resource_type": "Issue"}
 mr_event_content = {"id": 1, "resource_type": "MergeRequest"}
 

gitlab/tests/objects/test_runners.py

@@ -5,7 +5,6 @@
 
 import gitlab
 
-
 runner_detail = {
     "active": True,
     "architecture": "amd64",

gitlab/tests/objects/test_snippets.py

@@ -6,7 +6,6 @@
 import pytest
 import responses
 
-
 title = "Example Snippet Title"
 visibility = "private"
 new_title = "new-title"

gitlab/tests/objects/test_todos.py

@@ -10,7 +10,6 @@
 
 from gitlab.v4.objects import Todo
 
-
 with open(os.path.dirname(__file__) + "/../data/todo.json", "r") as json_file:
     todo_content = json_file.read()
     json_content = json.loads(todo_content)

gitlab/tests/objects/test_variables.py

@@ -12,7 +12,6 @@
 
 from gitlab.v4.objects import GroupVariable, ProjectVariable, Variable
 
-
 key = "TEST_VARIABLE_1"
 value = "TEST_1"
 new_value = "TEST_2"

gitlab/tests/test_base.py

@@ -17,9 +17,10 @@
 
 import pickle
 
-from gitlab import base
 import pytest
 
+from gitlab import base
+
 
 class FakeGitlab(object):
     pass

gitlab/tests/test_cli.py

@@ -17,10 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import io
 import os
 import tempfile
-import io
-
 from contextlib import redirect_stderr  # noqa: H302
 
 import pytest

gitlab/tests/test_config.py

@@ -15,15 +15,14 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import io
 import os
 from textwrap import dedent
 
 import mock
-import io
-
-from gitlab import config, USER_AGENT
 import pytest
 
+from gitlab import config, USER_AGENT
 
 custom_user_agent = "my-package/1.0.0"
 

gitlab/tests/test_gitlab.py

@@ -24,7 +24,6 @@
 from gitlab import Gitlab, GitlabList, USER_AGENT
 from gitlab.v4.objects import CurrentUser
 
-
 username = "username"
 user_id = 1
 

gitlab/tests/test_gitlab_http_methods.py

@@ -1,7 +1,6 @@
 import pytest
 import requests
-
-from httmock import HTTMock, urlmatch, response
+from httmock import HTTMock, response, urlmatch
 
 from gitlab import GitlabHttpError, GitlabList, GitlabParsingError
 

gitlab/v4/cli.py

@@ -22,8 +22,8 @@
 
 import gitlab
 import gitlab.base
-from gitlab import cli
 import gitlab.v4.objects
+from gitlab import cli
 
 
 class GitlabCLI(object):

gitlab/v4/objects/__init__.py

@@ -29,8 +29,8 @@
 from .container_registry import *
 from .custom_attributes import *
 from .deploy_keys import *
-from .deployments import *
 from .deploy_tokens import *
+from .deployments import *
 from .discussions import *
 from .environments import *
 from .epics import *
@@ -54,6 +54,7 @@
 from .notification_settings import *
 from .packages import *
 from .pages import *
+from .personal_access_tokens import *
 from .pipelines import *
 from .projects import *
 from .push_rules import *
@@ -71,8 +72,6 @@
 from .users import *
 from .variables import *
 from .wikis import *
-from .personal_access_tokens import *
-
 
 # TODO: deprecate these in favor of gitlab.const.*
 VISIBILITY_PRIVATE = "private"

gitlab/v4/objects/access_requests.py

@@ -7,7 +7,6 @@
     ObjectDeleteMixin,
 )
 
-
 __all__ = [
     "GroupAccessRequest",
     "GroupAccessRequestManager",

gitlab/v4/objects/appearance.py

@@ -2,7 +2,6 @@
 from gitlab.base import RequiredOptional, RESTManager, RESTObject
 from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin
 
-
 __all__ = [
     "ApplicationAppearance",
     "ApplicationAppearanceManager",

gitlab/v4/objects/award_emojis.py

@@ -1,7 +1,6 @@
 from gitlab.base import RequiredOptional, RESTManager, RESTObject
 from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin
 
-
 __all__ = [
     "ProjectIssueAwardEmoji",
     "ProjectIssueAwardEmojiManager",

gitlab/v4/objects/badges.py

@@ -1,7 +1,6 @@
 from gitlab.base import RequiredOptional, RESTManager, RESTObject
 from gitlab.mixins import BadgeRenderMixin, CRUDMixin, ObjectDeleteMixin, SaveMixin
 
-
 __all__ = [
     "GroupBadge",
     "GroupBadgeManager",