Skip to content

Commit 5a89437

Browse files
[CONFIG] auto isort imports (#20)
* Return None when the submodule commit is not contained in the diff * handle commit diff limitations - log warning - add test - update README.md * add `make isort` + run it * sync with master
1 parent 043928d commit 5a89437

9 files changed

+33
-28
lines changed

Makefile

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
PROJECT = gitlab_submodule
22

3+
ISORT_ARGS = \
4+
--project md_commons \
5+
--known-local-folder gitlab_submodule
6+
37
lint:
48
flake8 $(PROJECT) --count --show-source --statistics
59
flake8 tests --count --show-source --statistics
@@ -11,6 +15,9 @@ test:
1115
else nosetests -v --with-coverage --cover-package=$(PROJECT) tests; \
1216
fi
1317

18+
isort:
19+
isort $(ISORT_ARGS) gitlab_submodule tests
20+
1421
build_package:
1522
rm -rf dist && \
1623
python3 setup.py sdist && \

gitlab_submodule/__init__.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@
1212
'iterate_subprojects', 'list_subprojects'
1313
]
1414

15+
from gitlab_submodule.gitlab_submodule import (iterate_submodules,
16+
iterate_subprojects,
17+
list_subprojects,
18+
submodule_to_subproject)
1519
from gitlab_submodule.objects import Submodule, Subproject
16-
from gitlab_submodule.read_gitmodules import (
17-
list_project_submodules as list_submodules)
18-
from gitlab_submodule.gitlab_submodule import (
19-
iterate_submodules,
20-
submodule_to_subproject,
21-
iterate_subprojects,
22-
list_subprojects,
23-
)
20+
from gitlab_submodule.read_gitmodules import \
21+
list_project_submodules as list_submodules

gitlab_submodule/gitlab_submodule.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
from typing import List, Optional, Generator, Union
1+
from typing import Generator, List, Optional, Union
22

33
from gitlab import Gitlab
44
from gitlab.v4.objects import Project, ProjectManager
55

66
from gitlab_submodule.objects import Submodule, Subproject
7-
from gitlab_submodule.read_gitmodules import (
8-
iterate_project_submodules as iterate_submodules)
9-
from gitlab_submodule.submodule_to_project import submodule_to_project
7+
from gitlab_submodule.read_gitmodules import \
8+
iterate_project_submodules as iterate_submodules
109
from gitlab_submodule.submodule_commit import get_submodule_commit
10+
from gitlab_submodule.submodule_to_project import submodule_to_project
1111

1212

1313
def _get_project_manager(

gitlab_submodule/objects.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Union, Optional
1+
from typing import Optional, Union
22

33
from gitlab.v4.objects import Project, ProjectCommit
44

gitlab_submodule/read_gitmodules.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
from typing import List, Optional, Iterable, Tuple
2-
31
import re
2+
from typing import Iterable, List, Optional, Tuple
43

54
from gitlab.v4.objects import Project
65

gitlab_submodule/submodule_commit.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
from typing import Optional, Union
2-
31
import logging
42
import re
53
from os import path
4+
from typing import Optional, Union
65

7-
from gitlab.v4.objects import Project, ProjectCommit
86
from gitlab.exceptions import GitlabGetError
7+
from gitlab.v4.objects import Project, ProjectCommit
8+
9+
from gitlab_submodule.objects import Commit, Submodule
910

10-
from gitlab_submodule.objects import Submodule, Commit
11+
12+
logger = logging.getLogger(__name__)
1113

1214

1315
logger = logging.getLogger(__name__)

gitlab_submodule/submodule_to_project.py

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
from typing import Optional
21
import logging
3-
42
from posixpath import join, normpath
5-
from giturlparse import parse, GitUrlParsed
3+
from typing import Optional
64

7-
from gitlab.v4.objects import Project, ProjectManager
85
from gitlab.exceptions import GitlabGetError
6+
from gitlab.v4.objects import Project, ProjectManager
7+
from giturlparse import GitUrlParsed, parse
98

109
from gitlab_submodule.objects import Submodule
1110
from gitlab_submodule.string_utils import lstrip, rstrip

tests/test_gitlab_submodule.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
from gitlab import Gitlab
44

5-
from gitlab_submodule.objects import Subproject
65
from gitlab_submodule.gitlab_submodule import (iterate_submodules,
7-
submodule_to_subproject,
8-
list_subprojects)
6+
list_subprojects,
7+
submodule_to_subproject)
8+
from gitlab_submodule.objects import Subproject
99

1010

1111
class TestGitlabSubmodule(unittest.TestCase):

tests/test_submodule_commit.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from gitlab.v4.objects import ProjectCommit
77

88
from gitlab_submodule.read_gitmodules import list_project_submodules
9+
from gitlab_submodule.submodule_commit import (_get_submodule_commit_id,
10+
get_submodule_commit)
911
from gitlab_submodule.submodule_to_project import submodule_to_project
10-
from gitlab_submodule.submodule_commit import (get_submodule_commit,
11-
_get_submodule_commit_id)
1212

1313

1414
class TestSubmoduleCommit(unittest.TestCase):

0 commit comments

Comments
 (0)