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.
This commit is contained in:
mprahl
2020-01-06 11:19:47 -05:00
parent 0c8227679c
commit 81f2bffdda
95 changed files with 411 additions and 279 deletions

View File

@@ -1,19 +1,20 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
import os
from datetime import datetime
from mock import patch, PropertyMock
import pytest
import module_build_service.resolver as mbs_resolver
from module_build_service import conf, Modulemd
from module_build_service.builder.MockModuleBuilder import load_local_builds
from module_build_service.common import models
from module_build_service.common.errors import UnprocessableEntity
from module_build_service.common.models import ModuleBuild
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
from module_build_service.scheduler.db_session import db_session
from module_build_service.builder.MockModuleBuilder import load_local_builds
import tests

View File

@@ -1,15 +1,17 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
import pytest
from mock import patch, MagicMock
from __future__ import absolute_import
from datetime import datetime
from mock import patch, MagicMock
import pytest
from module_build_service import conf
from module_build_service.common.models import ModuleBuild, BUILD_STATES
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
import tests
from module_build_service.scheduler.db_session import db_session
import tests
@pytest.mark.usefixtures("reuse_component_init_data")

View File

@@ -1,13 +1,15 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
import pytest
from __future__ import absolute_import
from datetime import datetime
import pytest
from module_build_service import conf
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
from module_build_service.scheduler.db_session import db_session
from module_build_service.common.models import ModuleBuild
from module_build_service.common.utils import import_mmd, load_mmd, mmd_to_str
from module_build_service.scheduler.db_session import db_session
import module_build_service.resolver as mbs_resolver
import tests

View File

@@ -1,13 +1,15 @@
# -*- coding: utf-8 -*-
# SPDX-License-Identifier: MIT
from __future__ import absolute_import
from mock import patch, PropertyMock, Mock, call
from module_build_service import app, conf
from module_build_service.builder.MockModuleBuilder import load_local_builds
import module_build_service.common.models
from module_build_service.common.utils import load_mmd, mmd_to_str
import module_build_service.resolver as mbs_resolver
from module_build_service.scheduler.db_session import db_session
import module_build_service.common.models
import tests