Skip to content

[CONFIG] auto isort imports #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 27, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
PROJECT = gitlab_submodule

ISORT_ARGS = \
--project md_commons \
--known-local-folder gitlab_submodule

lint:
flake8 $(PROJECT) --count --show-source --statistics
flake8 tests --count --show-source --statistics
Expand All @@ -11,6 +15,9 @@ test:
else nosetests -v --with-coverage --cover-package=$(PROJECT) tests; \
fi

isort:
isort $(ISORT_ARGS) gitlab_submodule tests

build_package:
rm -rf dist && \
python3 setup.py sdist && \
Expand Down
14 changes: 6 additions & 8 deletions gitlab_submodule/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
'iterate_subprojects', 'list_subprojects'
]

from gitlab_submodule.gitlab_submodule import (iterate_submodules,
iterate_subprojects,
list_subprojects,
submodule_to_subproject)
from gitlab_submodule.objects import Submodule, Subproject
from gitlab_submodule.read_gitmodules import (
list_project_submodules as list_submodules)
from gitlab_submodule.gitlab_submodule import (
iterate_submodules,
submodule_to_subproject,
iterate_subprojects,
list_subprojects,
)
from gitlab_submodule.read_gitmodules import \
list_project_submodules as list_submodules
8 changes: 4 additions & 4 deletions gitlab_submodule/gitlab_submodule.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
from typing import List, Optional, Generator, Union
from typing import Generator, List, Optional, Union

from gitlab import Gitlab
from gitlab.v4.objects import Project, ProjectManager

from gitlab_submodule.objects import Submodule, Subproject
from gitlab_submodule.read_gitmodules import (
iterate_project_submodules as iterate_submodules)
from gitlab_submodule.submodule_to_project import submodule_to_project
from gitlab_submodule.read_gitmodules import \
iterate_project_submodules as iterate_submodules
from gitlab_submodule.submodule_commit import get_submodule_commit
from gitlab_submodule.submodule_to_project import submodule_to_project


def _get_project_manager(
Expand Down
2 changes: 1 addition & 1 deletion gitlab_submodule/objects.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from typing import Union, Optional
from typing import Optional, Union

from gitlab.v4.objects import Project, ProjectCommit

Expand Down
3 changes: 1 addition & 2 deletions gitlab_submodule/read_gitmodules.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from typing import List, Optional, Iterable, Tuple

import re
from typing import Iterable, List, Optional, Tuple

from gitlab.v4.objects import Project

Expand Down
10 changes: 6 additions & 4 deletions gitlab_submodule/submodule_commit.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
from typing import Optional, Union

import logging
import re
from os import path
from typing import Optional, Union

from gitlab.v4.objects import Project, ProjectCommit
from gitlab.exceptions import GitlabGetError
from gitlab.v4.objects import Project, ProjectCommit

from gitlab_submodule.objects import Commit, Submodule

from gitlab_submodule.objects import Submodule, Commit

logger = logging.getLogger(__name__)


logger = logging.getLogger(__name__)
Expand Down
7 changes: 3 additions & 4 deletions gitlab_submodule/submodule_to_project.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from typing import Optional
import logging

from posixpath import join, normpath
from giturlparse import parse, GitUrlParsed
from typing import Optional

from gitlab.v4.objects import Project, ProjectManager
from gitlab.exceptions import GitlabGetError
from gitlab.v4.objects import Project, ProjectManager
from giturlparse import GitUrlParsed, parse

from gitlab_submodule.objects import Submodule
from gitlab_submodule.string_utils import lstrip, rstrip
Expand Down
6 changes: 3 additions & 3 deletions tests/test_gitlab_submodule.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

from gitlab import Gitlab

from gitlab_submodule.objects import Subproject
from gitlab_submodule.gitlab_submodule import (iterate_submodules,
submodule_to_subproject,
list_subprojects)
list_subprojects,
submodule_to_subproject)
from gitlab_submodule.objects import Subproject


class TestGitlabSubmodule(unittest.TestCase):
Expand Down
4 changes: 2 additions & 2 deletions tests/test_submodule_commit.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from gitlab.v4.objects import ProjectCommit

from gitlab_submodule.read_gitmodules import list_project_submodules
from gitlab_submodule.submodule_commit import (_get_submodule_commit_id,
get_submodule_commit)
from gitlab_submodule.submodule_to_project import submodule_to_project
from gitlab_submodule.submodule_commit import (get_submodule_commit,
_get_submodule_commit_id)


class TestSubmoduleCommit(unittest.TestCase):
Expand Down