make tests work

Author: ValentinFrancois

.github/workflows/validate.yml

@@ -1,4 +1,4 @@
-name: Python package
+name: Check code
 
 on:
   push:
@@ -16,21 +16,18 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
+    - name: install python
       uses: actions/setup-python@v2
       with:
         python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
+    - name: install dependencies
       run: |
         python -m pip install --upgrade pip
-        python -m pip install flake8 nose
+        python -m pip install flake8 nose coverage
         pip install -r requirements.txt
-    - name: Lint with flake8
+    - name: lint
       run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-    - name: Test with nose
+        make lint
+    - name: test
       run: |
-        nosetests -v --with-coverage --cover-package=python-gitlab-submodule tests
+        make test

Makefile

@@ -0,0 +1,7 @@
+PROJECT = gitlab_submodule
+
+lint:
+	flake8 $(PROJECT) --count --show-source --statistics
+
+test:
+	nosetests -v --with-coverage --cover-package=$(PROJECT) tests

gitlab_submodule/__init__.py

@@ -5,13 +5,16 @@
 __all__ = [
     'Submodule', 'Subproject',
     'list_submodules',
+    'iterate_submodules',
     'submodule_to_subproject',
     'iterate_subprojects', 'list_subprojects'
 ]
 
 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 (
-    list_submodules,
+    iterate_submodules,
     submodule_to_subproject,
     iterate_subprojects,
     list_subprojects,

gitlab_submodule/gitlab_submodule.py

@@ -4,15 +4,12 @@
 from gitlab.v4.objects import Project, ProjectManager
 
 from gitlab_submodule.objects import Submodule, Subproject
-from gitlab_submodule.read_gitmodules import list_project_submodules, iterate_project_submodules
+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.submodule_commit import get_submodule_commit
 
 
-list_submodules = list_project_submodules
-iterate_submodules = iterate_project_submodules
-
-
 def _get_project_manager(
         gitlab_object: Union[Gitlab, ProjectManager]) -> ProjectManager:
     if isinstance(gitlab_object, ProjectManager):
@@ -51,7 +48,7 @@ def iterate_subprojects(
         get_latest_commit_possible_if_not_found: bool = False,
         get_latest_commit_possible_ref: Optional[str] = None
 ) -> Generator[Subproject, None, None]:
-    for gitmodules_submodule in iterate_project_submodules(project, ref):
+    for gitmodules_submodule in iterate_submodules(project, ref):
         try:
             yield submodule_to_subproject(
                 gitmodules_submodule,

tests/test_gitlab_submodule.py

@@ -3,7 +3,7 @@
 from gitlab import Gitlab
 
 from gitlab_submodule.objects import Subproject
-from gitlab_submodule.gitlab_submodule import (list_submodules,
+from gitlab_submodule.gitlab_submodule import (iterate_submodules,
                                                submodule_to_subproject,
                                                list_subprojects)
 
@@ -14,11 +14,16 @@ def test_read_inkscape_subproject(self):
 
         gl = Gitlab()
         inkscape = gl.projects.get('inkscape/inkscape')
-        submodules = list_submodules(
+        submodules = iterate_submodules(
             inkscape,
             ref='e371b2f826adcba316f2e64bbf2f697043373d0b')
-        submodule = [sub for sub in submodules if
-                     sub.url == 'https://gitlab.com/inkscape/lib2geom.git'][0]
+        submodule = None
+        for sub in submodules:
+            if sub.url == 'https://gitlab.com/inkscape/lib2geom.git':
+                submodule = sub
+                break
+        self.assertIsNotNone(submodule)
+
         submodule_info: Subproject = submodule_to_subproject(submodule, gl)
         self.assertEqual(submodule_info.submodule, submodule)