Rearrange the imports to meet the style guide

This also includes `from __future__ import absolute_import`
in every file so that the imports are consistent in Python 2 and 3.
The Python 2 tests fail without this.

tests/test_builder/test_base.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
+
 import mock
-
-import module_build_service.common.models
-import module_build_service.builder
-import module_build_service.resolver
-
-from tests import init_data
-
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.builder import GenericBuilder
 from mock import patch
 
+import module_build_service.builder
+from module_build_service.builder import GenericBuilder
+import module_build_service.common.models
+import module_build_service.resolver
+from module_build_service.scheduler.db_session import db_session
+from tests import init_data
+
 
 class TestGenericBuilder:
     def setup_method(self, test_method):

tests/test_builder/test_builder_utils.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
-import tempfile
+from __future__ import absolute_import
 import shutil
+import tempfile
 
 from mock import call, MagicMock, Mock, patch, PropertyMock
 import pytest
@@ -9,9 +10,9 @@ import pytest
 from module_build_service import conf
 from module_build_service.builder import utils
 from module_build_service.common import models
-from module_build_service.scheduler.db_session import db_session
 from module_build_service.common.errors import ProgrammingError, ValidationError
 from module_build_service.common.utils import load_mmd, import_mmd, mmd_to_str
+from module_build_service.scheduler.db_session import db_session
 from tests import init_data, read_staged_data, scheduler_init_data
 
 

tests/test_builder/test_content_generator.py

@@ -1,26 +1,24 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import io
-import pytest
 import json
-
 import os
 from os import path
 
+import kobo.rpmlib
+import koji
+from mock import patch, Mock, call, mock_open
+import pytest
+
 from module_build_service import conf, build_logs, Modulemd
+from module_build_service.builder.KojiContentGenerator import KojiContentGenerator
 from module_build_service.common import models
 from module_build_service.common.utils import load_mmd, load_mmd_file, mmd_to_str
 from module_build_service.scheduler.db_session import db_session
-
-from mock import patch, Mock, call, mock_open
-import kobo.rpmlib
-
 from tests import init_data
 from tests.test_web.test_views import FakeSCM
 
-import koji
-
-from module_build_service.builder.KojiContentGenerator import KojiContentGenerator
 
 GET_USER_RV = {
     "id": 3686,

tests/test_builder/test_koji.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 from collections import OrderedDict
 import os
 import shutil
@@ -10,14 +11,14 @@ import mock
 from mock import patch, MagicMock
 import pytest
 
-import module_build_service.scheduler.handlers.repos
-import module_build_service.common.models
 from module_build_service import conf, Modulemd
-from module_build_service.common.utils import mmd_to_str
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
 from module_build_service.builder import GenericBuilder
+from module_build_service.builder.KojiModuleBuilder import KojiModuleBuilder
+import module_build_service.common.models
+from module_build_service.common.utils import mmd_to_str
 from module_build_service.scheduler import events
+from module_build_service.scheduler.db_session import db_session
+import module_build_service.scheduler.handlers.repos
 from tests import init_data, clean_database, make_module_in_db
 
 

tests/test_builder/test_mock.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 # SPDX-License-Identifier: MIT
+from __future__ import absolute_import
 import os
 import tempfile
 import shutil
@@ -11,17 +12,17 @@ import mock
 import pytest
 
 from module_build_service import conf
-from module_build_service.common import models
-from module_build_service.common.utils import load_mmd, mmd_to_str
-from module_build_service.scheduler.db_session import db_session
-from module_build_service.common.models import ModuleBuild, ComponentBuild
 from module_build_service.builder.MockModuleBuilder import (
     import_fake_base_module,
     import_builds_from_local_dnf_repos,
     load_local_builds,
     MockModuleBuilder,
 )
+from module_build_service.common import models
+from module_build_service.common.models import ModuleBuild, ComponentBuild
+from module_build_service.common.utils import load_mmd, mmd_to_str
 from module_build_service.scheduler import events
+from module_build_service.scheduler.db_session import db_session
 from tests import clean_database, make_module_in_db, read_staged_data, staged_data_filename